16858 2008-01-12 23:08:13 -0800 wxWebKit DRT preparations part 1 2008-01-13 11:35:57 -0800 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 kevino webkit-unassigned oldest_to_newest 67094 0 kevino 2008-01-12 23:08:13 -0800 wxWebKit API changes in preparation for DRT implementation. Specifically: - Add CONSOLE_MESSAGE callback so clients can choose how to handle console messages. - Add more load events, and rename wxWebViewStateChangedEvent to wxWebViewLoadEvent to reflect that all 'states' are load states. - Add wxWebView impls. for GetInnerText(), GetAsMarkup() and GetExternalRepresentation() Part #2 will add event callbacks for JS prompts, confirms, and alerts. 67095 1 18417 kevino 2008-01-12 23:09:08 -0800 Created attachment 18417 wxWebKit DRT prep part 1 67114 2 18417 darin 2008-01-13 09:05:33 -0800 Comment on attachment 18417 wxWebKit DRT prep part 1 r=me 67131 3 kevino 2008-01-13 11:35:57 -0800 Landed in r29453. Thanks! 18417 2008-01-12 23:09:08 -0800 2008-01-13 09:05:33 -0800 wxWebKit DRT prep part 1 wxwebkit-drt-prep1.patch text/plain 18472 kevino SW5kZXg6IFdlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L0NoYW5n ZUxvZwkocmV2aXNpb24gMjk0NDQpCisrKyBXZWJLaXQvd3gvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDUgKzEsNDIgQEAKIDIwMDgtMDEtMTIgIEtldmluIE9sbGl2aWVyICA8a2V2aW5v QHRoZW9sbGl2aWVycy5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgd3hXZWJLaXQgQVBJIGNoYW5nZXMgaW4gcHJlcGFyYXRpb24gZm9yIERSVCBp bXBsZW1lbnRhdGlvbi4gCisgICAgICAgIFNwZWNpZmljYWxseToKKworICAgICAgICAtIEFkZCBD T05TT0xFX01FU1NBR0UgY2FsbGJhY2sgc28gY2xpZW50cyBjYW4gY2hvb3NlIGhvdyB0byBoYW5k bGUKKyAgICAgICAgY29uc29sZSBtZXNzYWdlcy4KKyAgICAgICAgLSBBZGQgbW9yZSBsb2FkIGV2 ZW50cywgYW5kIHJlbmFtZSB3eFdlYlZpZXdTdGF0ZUNoYW5nZWRFdmVudCB0byAKKyAgICAgICAg d3hXZWJWaWV3TG9hZEV2ZW50IHRvIHJlZmxlY3QgdGhhdCBhbGwgJ3N0YXRlcycgYXJlIGxvYWQg c3RhdGVzLgorICAgICAgICAtIEFkZCB3eFdlYlZpZXcgaW1wbHMuIGZvciBHZXRJbm5lclRleHQo KSwgR2V0QXNNYXJrdXAoKSBhbmQgCisgICAgICAgIEdldEV4dGVybmFsUmVwcmVzZW50YXRpb24o KQorCisgICAgICAgICogV2ViRnJhbWUuY3BwOgorICAgICAgICAod3hXZWJGcmFtZTo6T25Mb2Fk RXZlbnQpOgorICAgICAgICAqIFdlYkZyYW1lLmg6CisgICAgICAgICogV2ViS2l0U3VwcG9ydC9D aHJvbWVDbGllbnRXeC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRXeDo6Q2hy b21lQ2xpZW50V3gpOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50V3g6OmFkZE1lc3Nh Z2VUb0NvbnNvbGUpOgorICAgICAgICAqIFdlYktpdFN1cHBvcnQvQ2hyb21lQ2xpZW50V3guaDoK KyAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRXeDo6ZGlzcGF0Y2hEaWRIYW5kbGVPbmxvYWRF dmVudHMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRXeDo6ZGlzcGF0Y2hE aWRTdGFydFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNs aWVudFd4OjpkaXNwYXRjaERpZENvbW1pdExvYWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXJDbGllbnRXeDo6ZGlzcGF0Y2hEaWRGaW5pc2hEb2N1bWVudExvYWQpOgorICAgICAgICAo V2ViQ29yZTo6RnJhbWVMb2FkZXJDbGllbnRXeDo6cG9zdFByb2dyZXNzRmluaXNoZWROb3RpZmlj YXRpb24pOgorICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAod3hXZWJWaWV3TG9hZEV2 ZW50Ojp3eFdlYlZpZXdMb2FkRXZlbnQpOgorICAgICAgICAod3hXZWJWaWV3Q29uc29sZU1lc3Nh Z2VFdmVudDo6d3hXZWJWaWV3Q29uc29sZU1lc3NhZ2VFdmVudCk6CisgICAgICAgICh3eFdlYlZp ZXc6Ond4V2ViVmlldyk6CisgICAgICAgICh3eFdlYlZpZXc6OkdldFBhZ2VTb3VyY2UpOgorICAg ICAgICAod3hXZWJWaWV3OjpHZXRJbm5lclRleHQpOgorICAgICAgICAod3hXZWJWaWV3OjpHZXRB c01hcmt1cCk6CisgICAgICAgICh3eFdlYlZpZXc6OkdldEV4dGVybmFsUmVwcmVzZW50YXRpb24p OgorICAgICAgICAqIFdlYlZpZXcuaDoKKworMjAwOC0wMS0xMiAgS2V2aW4gT2xsaXZpZXIgIDxr ZXZpbm9AdGhlb2xsaXZpZXJzLmNvbT4KKwogICAgICAgICB3eCBidWlsZCBmaXguIEFkZCBXZWJD b3JlL2ljdS9pbmNsdWRlIGRpciBmb3IgT1MgWCBib3hlcyB3aXRoCiAgICAgICAgIG9ubHkgc3Rv Y2sgSUNVIGluc3RhbGxlZC4KIApJbmRleDogV2ViS2l0L3d4L1dlYkZyYW1lLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViS2l0L3d4L1dlYkZyYW1lLmgJKHJldmlzaW9uIDI5NDQzKQorKysgV2ViS2l0L3d4 L1dlYkZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTYwLDcgKzYwLDcgQEAKICAgICB2b2lkIE9u TG9hZEZpbGUod3hDb21tYW5kRXZlbnQmIGV2ZW50KTsKICAgICB2b2lkIE9uQWRkcmVzc0JhckVu dGVyKHd4Q29tbWFuZEV2ZW50JiBldmVudCk7CiAgICAgdm9pZCBPblNlYXJjaEN0cmxFbnRlcih3 eENvbW1hbmRFdmVudCYgZXZlbnQpOwotICAgIHZvaWQgT25TdGF0ZUNoYW5nZWRFdmVudCh3eFdl YlZpZXdTdGF0ZUNoYW5nZWRFdmVudCYgZXZlbnQpOworICAgIHZvaWQgT25Mb2FkRXZlbnQod3hX ZWJWaWV3TG9hZEV2ZW50JiBldmVudCk7CiAgICAgdm9pZCBPbkJlZm9yZUxvYWQod3hXZWJWaWV3 QmVmb3JlTG9hZEV2ZW50JiBldmVudCk7CiAgICAgdm9pZCBPbkJhY2sod3hDb21tYW5kRXZlbnQm IGV2ZW50KTsKICAgICB2b2lkIE9uRm9yd2FyZCh3eENvbW1hbmRFdmVudCYgZXZlbnQpOwpJbmRl eDogV2ViS2l0L3d4L1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd3gvV2ViVmlldy5o CShyZXZpc2lvbiAyOTQ0MykKKysrIFdlYktpdC93eC9XZWJWaWV3LmgJKHdvcmtpbmcgY29weSkK QEAgLTkxLDYgKzkxLDEwIEBACiAgICAgLy9ib29sIENhbkdldFBhZ2VTb3VyY2UoKTsKICAgICB3 eFN0cmluZyBHZXRQYWdlU291cmNlKCk7CiAgICAgdm9pZCBTZXRQYWdlU291cmNlKGNvbnN0IHd4 U3RyaW5nJiBzb3VyY2UsIGNvbnN0IHd4U3RyaW5nJiBiYXNlVXJsID0gd3hFbXB0eVN0cmluZyk7 CisJCisgICAgd3hTdHJpbmcgR2V0SW5uZXJUZXh0KCk7CisgICAgd3hTdHJpbmcgR2V0QXNNYXJr dXAoKTsKKyAgICB3eFN0cmluZyBHZXRFeHRlcm5hbFJlcHJlc2VudGF0aW9uKCk7CiAgICAgCiAg ICAgd3hTdHJpbmcgUnVuU2NyaXB0KGNvbnN0IHd4U3RyaW5nJiBqYXZhc2NyaXB0KTsKICAgICAK QEAgLTEzNCwxMiArMTM4LDE2IEBACiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIGVudW0gewot ICAgIHd4V0VCVklFV19TVEFURV9TVEFSVCA9IDEsCi0gICAgd3hXRUJWSUVXX1NUQVRFX05FR09U SUFUSU5HID0gMiwKLSAgICB3eFdFQlZJRVdfU1RBVEVfUkVESVJFQ1RJTkcgPSA0LAotICAgIHd4 V0VCVklFV19TVEFURV9UUkFOU0ZFUlJJTkcgPSA4LAotICAgIHd4V0VCVklFV19TVEFURV9TVE9Q ID0gMTYsCi0gICAgd3hXRUJWSUVXX1NUQVRFX0ZBSUxFRCA9IDMyCisgICAgd3hXRUJWSUVXX0xP QURfU1RBUlRFRCA9IDEsCisgICAgd3hXRUJWSUVXX0xPQURfTkVHT1RJQVRJTkcgPSAyLAorICAg IHd4V0VCVklFV19MT0FEX1JFRElSRUNUSU5HID0gNCwKKyAgICB3eFdFQlZJRVdfTE9BRF9UUkFO U0ZFUlJJTkcgPSA4LAorICAgIHd4V0VCVklFV19MT0FEX1NUT1BQRUQgPSAxNiwKKyAgICB3eFdF QlZJRVdfTE9BRF9GQUlMRUQgPSAzMiwKKyAgICB3eFdFQlZJRVdfTE9BRF9ETF9DT01QTEVURUQg PSA2NCwKKyAgICB3eFdFQlZJRVdfTE9BRF9ET0NfQ09NUExFVEVEID0gMTI4LAorICAgIHd4V0VC VklFV19MT0FEX09OTE9BRF9IQU5ETEVEID0gMjU2LAorICAgIHd4V0VCVklFV19MT0FEX1dJTkRP V19PQkpFQ1RfQ0xFQVJFRCA9IDUxMgogfTsKIAogZW51bSB7CkBAIC0yMDUsMTAgKzIxMywxMCBA QAogICAgIGludCBtX25hdlR5cGU7CiB9OwogCi1jbGFzcyBXWERMTElNUEVYUF9XRUJLSVQgd3hX ZWJWaWV3U3RhdGVDaGFuZ2VkRXZlbnQgOiBwdWJsaWMgd3hDb21tYW5kRXZlbnQKK2NsYXNzIFdY RExMSU1QRVhQX1dFQktJVCB3eFdlYlZpZXdMb2FkRXZlbnQgOiBwdWJsaWMgd3hDb21tYW5kRXZl bnQKIHsKICNpZm5kZWYgU1dJRwotICAgIERFQ0xBUkVfRFlOQU1JQ19DTEFTUyggd3hXZWJWaWV3 U3RhdGVDaGFuZ2VkRXZlbnQgKQorICAgIERFQ0xBUkVfRFlOQU1JQ19DTEFTUyggd3hXZWJWaWV3 TG9hZEV2ZW50ICkKICNlbmRpZgogCiBwdWJsaWM6CkBAIC0yMTcsOCArMjI1LDggQEAKICAgICB3 eFN0cmluZyBHZXRVUkwoKSBjb25zdCB7IHJldHVybiBtX3VybDsgfQogICAgIHZvaWQgU2V0VVJM KGNvbnN0IHd4U3RyaW5nJiB1cmwpIHsgbV91cmwgPSB1cmw7IH0KIAotICAgIHd4V2ViVmlld1N0 YXRlQ2hhbmdlZEV2ZW50KCB3eFdpbmRvdyogd2luID0gKHd4V2luZG93KikgTlVMTCApOwotICAg IHd4RXZlbnQgKkNsb25lKHZvaWQpIGNvbnN0IHsgcmV0dXJuIG5ldyB3eFdlYlZpZXdTdGF0ZUNo YW5nZWRFdmVudCgqdGhpcyk7IH0KKyAgICB3eFdlYlZpZXdMb2FkRXZlbnQoIHd4V2luZG93KiB3 aW4gPSAod3hXaW5kb3cqKSBOVUxMICk7CisgICAgd3hFdmVudCAqQ2xvbmUodm9pZCkgY29uc3Qg eyByZXR1cm4gbmV3IHd4V2ViVmlld0xvYWRFdmVudCgqdGhpcyk7IH0KIAogcHJpdmF0ZToKICAg ICBpbnQgbV9zdGF0ZTsKQEAgLTI2MywyNiArMjcxLDUzIEBACiAgICAgd3hQb2ludCBtX3Bvc2l0 aW9uOwogfTsKIAotdHlwZWRlZiB2b2lkICh3eEV2dEhhbmRsZXI6Oip3eFdlYlZpZXdTdGF0ZUNo YW5nZWRFdmVudEZ1bmN0aW9uKSh3eFdlYlZpZXdTdGF0ZUNoYW5nZWRFdmVudCYpOworY2xhc3Mg V1hETExJTVBFWFBfV0VCS0lUIHd4V2ViVmlld0NvbnNvbGVNZXNzYWdlRXZlbnQgOiBwdWJsaWMg d3hDb21tYW5kRXZlbnQKK3sKKyNpZm5kZWYgU1dJRworICAgIERFQ0xBUkVfRFlOQU1JQ19DTEFT Uyggd3hXZWJWaWV3Q29uc29sZU1lc3NhZ2VFdmVudCApCisjZW5kaWYKKworcHVibGljOgorICAg IHd4U3RyaW5nIEdldE1lc3NhZ2UoKSBjb25zdCB7IHJldHVybiBtX21lc3NhZ2U7IH0KKyAgICB2 b2lkIFNldE1lc3NhZ2UoY29uc3Qgd3hTdHJpbmcmIG1lc3NhZ2UpIHsgbV9tZXNzYWdlID0gbWVz c2FnZTsgfQorICAgIAorICAgIHVuc2lnbmVkIGludCBHZXRMaW5lTnVtYmVyKCkgY29uc3QgeyBy ZXR1cm4gbV9saW5lTnVtYmVyOyB9CisgICAgdm9pZCBTZXRMaW5lTnVtYmVyKHVuc2lnbmVkIGlu dCBsaW5lTnVtYmVyKSB7IG1fbGluZU51bWJlciA9IGxpbmVOdW1iZXI7IH0KKyAgICAKKyAgICB3 eFN0cmluZyBHZXRTb3VyY2VJRCgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlSUQ7IH0KKyAgICB2 b2lkIFNldFNvdXJjZUlEKGNvbnN0IHd4U3RyaW5nJiBzb3VyY2VJRCkgeyBtX3NvdXJjZUlEID0g c291cmNlSUQ7IH0KKworICAgIHd4V2ViVmlld0NvbnNvbGVNZXNzYWdlRXZlbnQoIHd4V2luZG93 KiB3aW4gPSAod3hXaW5kb3cqKSBOVUxMICk7CisgICAgd3hFdmVudCAqQ2xvbmUodm9pZCkgY29u c3QgeyByZXR1cm4gbmV3IHd4V2ViVmlld0NvbnNvbGVNZXNzYWdlRXZlbnQoKnRoaXMpOyB9CisK K3ByaXZhdGU6CisgICAgdW5zaWduZWQgaW50IG1fbGluZU51bWJlcjsKKyAgICB3eFN0cmluZyBt X21lc3NhZ2U7CisgICAgd3hTdHJpbmcgbV9zb3VyY2VJRDsKK307CisKK3R5cGVkZWYgdm9pZCAo d3hFdnRIYW5kbGVyOjoqd3hXZWJWaWV3TG9hZEV2ZW50RnVuY3Rpb24pKHd4V2ViVmlld0xvYWRF dmVudCYpOwogdHlwZWRlZiB2b2lkICh3eEV2dEhhbmRsZXI6Oip3eFdlYlZpZXdCZWZvcmVMb2Fk RXZlbnRGdW5jdGlvbikod3hXZWJWaWV3QmVmb3JlTG9hZEV2ZW50Jik7CiB0eXBlZGVmIHZvaWQg KHd4RXZ0SGFuZGxlcjo6Knd4V2ViVmlld05ld1dpbmRvd0V2ZW50RnVuY3Rpb24pKHd4V2ViVmll d05ld1dpbmRvd0V2ZW50Jik7CiB0eXBlZGVmIHZvaWQgKHd4RXZ0SGFuZGxlcjo6Knd4V2ViVmll d1JpZ2h0Q2xpY2tFdmVudEZ1bmN0aW9uKSh3eFdlYlZpZXdSaWdodENsaWNrRXZlbnQmKTsKK3R5 cGVkZWYgdm9pZCAod3hFdnRIYW5kbGVyOjoqd3hXZWJWaWV3Q29uc29sZU1lc3NhZ2VFdmVudEZ1 bmN0aW9uKSh3eFdlYlZpZXdDb25zb2xlTWVzc2FnZUV2ZW50Jik7CiAKICNpZm5kZWYgU1dJRwog QkVHSU5fREVDTEFSRV9FVkVOVF9UWVBFUygpCiAgICAgREVDTEFSRV9FWFBPUlRFRF9FVkVOVF9U WVBFKFdYRExMSU1QRVhQX1dFQktJVCwgd3hFVlRfV0VCVklFV19CRUZPUkVfTE9BRCwgd3hJRF9B TlkpCi0gICAgREVDTEFSRV9FWFBPUlRFRF9FVkVOVF9UWVBFKFdYRExMSU1QRVhQX1dFQktJVCwg d3hFVlRfV0VCVklFV19TVEFURV9DSEFOR0VELCB3eElEX0FOWSkKKyAgICBERUNMQVJFX0VYUE9S VEVEX0VWRU5UX1RZUEUoV1hETExJTVBFWFBfV0VCS0lULCB3eEVWVF9XRUJWSUVXX0xPQUQsIHd4 SURfQU5ZKQogICAgIERFQ0xBUkVfRVhQT1JURURfRVZFTlRfVFlQRShXWERMTElNUEVYUF9XRUJL SVQsIHd4RVZUX1dFQlZJRVdfTkVXX1dJTkRPVywgd3hJRF9BTlkpCiAgICAgREVDTEFSRV9FWFBP UlRFRF9FVkVOVF9UWVBFKFdYRExMSU1QRVhQX1dFQktJVCwgd3hFVlRfV0VCVklFV19SSUdIVF9D TElDSywgd3hJRF9BTlkpCisgICAgREVDTEFSRV9FWFBPUlRFRF9FVkVOVF9UWVBFKFdYRExMSU1Q RVhQX1dFQktJVCwgd3hFVlRfV0VCVklFV19DT05TT0xFX01FU1NBR0UsIHd4SURfQU5ZKQogRU5E X0RFQ0xBUkVfRVZFTlRfVFlQRVMoKQogI2VuZGlmCiAKLSNkZWZpbmUgRVZUX1dFQlZJRVdfU1RB VEVfQ0hBTkdFRChmdW5jKSBcCi0gICAgICAgICAgICBERUNMQVJFX0VWRU5UX1RBQkxFX0VOVFJZ KCB3eEVWVF9XRUJWSUVXX1NUQVRFX0NIQU5HRUQsIFwKKyNkZWZpbmUgRVZUX1dFQlZJRVdfTE9B RChmdW5jKSBcCisgICAgICAgICAgICBERUNMQVJFX0VWRU5UX1RBQkxFX0VOVFJZKCB3eEVWVF9X RUJWSUVXX0xPQUQsIFwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3eElEX0FOWSwgXAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHd4SURfQU5ZLCBcCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKHd4T2JqZWN0RXZlbnRGdW5jdGlvbikgICBcCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgKHd4V2ViVmlld1N0YXRlQ2hhbmdlZEV2ZW50RnVuY3Rpb24pICYgZnVuYywg XAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3eFdlYlZpZXdMb2FkRXZlbnRGdW5jdGlv bikgJiBmdW5jLCBcCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8d3hP YmplY3QqPihOVUxMKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAjZGVmaW5lIEVW VF9XRUJWSUVXX0JFRk9SRV9MT0FEKGZ1bmMpIFwKQEAgLTI5NCwxMSArMzI5LDExIEBACiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgc3RhdGljX2Nhc3Q8d3hPYmplY3QqPihOVUxMKSksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAjZGVmaW5lIEVWVF9XRUJWSUVXX05FV19XSU5E T1coZnVuYykgXAotICAgICAgICAgICAgREVDTEFSRV9FVkVOVF9UQUJMRV9FTlRSWSggd3hFVlRf V0VCVklFV19CRUZPUkVfTE9BRCwgXAorICAgICAgICAgICAgREVDTEFSRV9FVkVOVF9UQUJMRV9F TlRSWSggd3hFVlRfV0VCVklFV19ORVdfV0lORE9XLCBcCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgd3hJRF9BTlksIFwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICB3eElEX0FOWSwg XAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3eE9iamVjdEV2ZW50RnVuY3Rpb24pICAg XAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICh3eFdlYlZpZXdCZWZvcmVMb2FkRXZlbnRG dW5jdGlvbikgJiBmdW5jLCBcCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHd4V2ViVmll d05ld1dpbmRvd0V2ZW50RnVuY3Rpb24pICYgZnVuYywgXAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHN0YXRpY19jYXN0PHd4T2JqZWN0Kj4oTlVMTCkpLAogCiAjZGVmaW5lIEVWVF9XRUJW SUVXX1JJR0hUX0NMSUNLKGZ1bmMpIFwKQEAgLTMwOCw1ICszNDMsMTMgQEAKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAod3hPYmplY3RFdmVudEZ1bmN0aW9uKSAgIFwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAod3hXZWJWaWV3UmlnaHRDbGlja0V2ZW50RnVuY3Rpb24pICYgZnVu YywgXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PHd4T2JqZWN0Kj4o TlVMTCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIAorI2RlZmluZSBFVlRfV0VCVklF V19DT05TT0xFX01FU1NBR0UoZnVuYykgXAorICAgICAgICAgICAgREVDTEFSRV9FVkVOVF9UQUJM RV9FTlRSWSggd3hFVlRfV0VCVklFV19DT05TT0xFX01FU1NBR0UsIFwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICB3eElEX0FOWSwgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHd4 SURfQU5ZLCBcCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHd4T2JqZWN0RXZlbnRGdW5j dGlvbikgICBcCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHd4V2ViVmlld0NvbnNvbGVN ZXNzYWdlRXZlbnRGdW5jdGlvbikgJiBmdW5jLCBcCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgc3RhdGljX2Nhc3Q8d3hPYmplY3QqPihOVUxMKSksCiAKICNlbmRpZiAvLyBpZm5kZWYgV1hX RUJWSUVXX0gKSW5kZXg6IFdlYktpdC93eC9XZWJGcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L3d4L1dlYkZyYW1lLmNwcAkocmV2aXNpb24gMjk0NDMpCisrKyBXZWJLaXQvd3gvV2ViRnJh bWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03MSw3ICs3MSw3IEBACiAgICAgRVZUX01FTlUoSURf TE9BREZJTEUsIHd4V2ViRnJhbWU6Ok9uTG9hZEZpbGUpCiAgICAgRVZUX1RFWFRfRU5URVIoSURf VEVYVENUUkwsIHd4V2ViRnJhbWU6Ok9uQWRkcmVzc0JhckVudGVyKQogICAgIEVWVF9URVhUX0VO VEVSKElEX1NFQVJDSENUUkwsIHd4V2ViRnJhbWU6Ok9uU2VhcmNoQ3RybEVudGVyKQotICAgIEVW VF9XRUJWSUVXX1NUQVRFX0NIQU5HRUQod3hXZWJGcmFtZTo6T25TdGF0ZUNoYW5nZWRFdmVudCkK KyAgICBFVlRfV0VCVklFV19MT0FEKHd4V2ViRnJhbWU6Ok9uTG9hZEV2ZW50KQogICAgIEVWVF9X RUJWSUVXX0JFRk9SRV9MT0FEKHd4V2ViRnJhbWU6Ok9uQmVmb3JlTG9hZCkKICAgICBFVlRfTUVO VShJRF9CQUNLLCB3eFdlYkZyYW1lOjpPbkJhY2spCiAgICAgRVZUX01FTlUoSURfRk9SV0FSRCwg d3hXZWJGcmFtZTo6T25Gb3J3YXJkKQpAQCAtMjA4LDIxICsyMDgsMjEgQEAKICAgICB9CiB9CiAK LXZvaWQgd3hXZWJGcmFtZTo6T25TdGF0ZUNoYW5nZWRFdmVudCh3eFdlYlZpZXdTdGF0ZUNoYW5n ZWRFdmVudCYgZXZlbnQpCit2b2lkIHd4V2ViRnJhbWU6Ok9uTG9hZEV2ZW50KHd4V2ViVmlld0xv YWRFdmVudCYgZXZlbnQpCiB7CiAgICAgaWYgKEdldFN0YXR1c0JhcigpICE9IE5VTEwpewotICAg ICAgICBpZiAoZXZlbnQuR2V0U3RhdGUoKSA9PSB3eFdFQlZJRVdfU1RBVEVfTkVHT1RJQVRJTkcp IHsKKyAgICAgICAgaWYgKGV2ZW50LkdldFN0YXRlKCkgPT0gd3hXRUJWSUVXX0xPQURfTkVHT1RJ QVRJTkcpIHsKICAgICAgICAgICAgIEdldFN0YXR1c0JhcigpLT5TZXRTdGF0dXNUZXh0KF8oIkNv bnRhY3RpbmcgIikgKyBldmVudC5HZXRVUkwoKSk7CiAgICAgICAgIH0KLSAgICAgICAgZWxzZSBp ZiAoZXZlbnQuR2V0U3RhdGUoKSA9PSB3eFdFQlZJRVdfU1RBVEVfVFJBTlNGRVJSSU5HKSB7Cisg ICAgICAgIGVsc2UgaWYgKGV2ZW50LkdldFN0YXRlKCkgPT0gd3hXRUJWSUVXX0xPQURfVFJBTlNG RVJSSU5HKSB7CiAgICAgICAgICAgICBHZXRTdGF0dXNCYXIoKS0+U2V0U3RhdHVzVGV4dChfKCJM b2FkaW5nICIpICsgZXZlbnQuR2V0VVJMKCkpOwogICAgICAgICB9Ci0gICAgICAgIGVsc2UgaWYg KGV2ZW50LkdldFN0YXRlKCkgPT0gd3hXRUJWSUVXX1NUQVRFX1NUT1ApIHsKKyAgICAgICAgZWxz ZSBpZiAoZXZlbnQuR2V0U3RhdGUoKSA9PSB3eFdFQlZJRVdfTE9BRF9PTkxPQURfSEFORExFRCkg ewogICAgICAgICAgICAgR2V0U3RhdHVzQmFyKCktPlNldFN0YXR1c1RleHQoXygiTG9hZCBjb21w bGV0ZS4iKSk7CiAgICAgICAgICAgICBhZGRyZXNzQmFyLT5TZXRWYWx1ZShldmVudC5HZXRVUkwo KSk7CiAgICAgICAgICAgICBTZXRUaXRsZSh3ZWJ2aWV3LT5HZXRQYWdlVGl0bGUoKSk7CiAgICAg ICAgIH0KLSAgICAgICAgZWxzZSBpZiAoZXZlbnQuR2V0U3RhdGUoKSA9PSB3eFdFQlZJRVdfU1RB VEVfRkFJTEVEKSB7CisgICAgICAgIGVsc2UgaWYgKGV2ZW50LkdldFN0YXRlKCkgPT0gd3hXRUJW SUVXX0xPQURfRkFJTEVEKSB7CiAgICAgICAgICAgICBHZXRTdGF0dXNCYXIoKS0+U2V0U3RhdHVz VGV4dChfKCJGYWlsZWQgdG8gbG9hZCAiKSArIGV2ZW50LkdldFVSTCgpKTsKICAgICAgICAgfQog ICAgIH0KSW5kZXg6IFdlYktpdC93eC9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv d3gvV2ViVmlldy5jcHAJKHJldmlzaW9uIDI5NDQzKQorKysgV2ViS2l0L3d4L1dlYlZpZXcuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAj aW5jbHVkZSAiRGVwcmVjYXRlZFN0cmluZy5oIgogI2luY2x1ZGUgIkRvY3VtZW50LmgiCisjaW5j bHVkZSAiRWxlbWVudC5oIgogI2luY2x1ZGUgIkVkaXRvci5oIgogI2luY2x1ZGUgIkV2ZW50SGFu ZGxlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCkBAIC0zNCwxMiArMzUsMTQgQEAKICNpbmNsdWRl ICJHcmFwaGljc0NvbnRleHQuaCIKICNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIK ICNpbmNsdWRlICJMb2dnaW5nLmgiCisjaW5jbHVkZSAibWFya3VwLmgiCiAjaW5jbHVkZSAiUGFn ZS5oIgogI2luY2x1ZGUgIlBsYXRmb3JtS2V5Ym9hcmRFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRm b3JtTW91c2VFdmVudC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAi UGxhdGZvcm1XaGVlbEV2ZW50LmgiCiAjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCisjaW5jbHVk ZSAiUmVuZGVyVHJlZUFzVGV4dC5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAKICNpbmNsdWRl ICJDaHJvbWVDbGllbnRXeC5oIgpAQCAtODIsMTMgKzg1LDEzIEBACiAvLyB3eFdlYlZpZXcgRXZl bnRzCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKLUlNUExFTUVOVF9EWU5BTUlDX0NMQVNTKHd4 V2ViVmlld1N0YXRlQ2hhbmdlZEV2ZW50LCB3eENvbW1hbmRFdmVudCkKK0lNUExFTUVOVF9EWU5B TUlDX0NMQVNTKHd4V2ViVmlld0xvYWRFdmVudCwgd3hDb21tYW5kRXZlbnQpCiAKLURFRklORV9F VkVOVF9UWVBFKHd4RVZUX1dFQlZJRVdfU1RBVEVfQ0hBTkdFRCkKK0RFRklORV9FVkVOVF9UWVBF KHd4RVZUX1dFQlZJRVdfTE9BRCkKIAotd3hXZWJWaWV3U3RhdGVDaGFuZ2VkRXZlbnQ6Ond4V2Vi Vmlld1N0YXRlQ2hhbmdlZEV2ZW50KHd4V2luZG93KiB3aW4pCit3eFdlYlZpZXdMb2FkRXZlbnQ6 Ond4V2ViVmlld0xvYWRFdmVudCh3eFdpbmRvdyogd2luKQogewotICAgIFNldEV2ZW50VHlwZSgg d3hFVlRfV0VCVklFV19TVEFURV9DSEFOR0VEKTsKKyAgICBTZXRFdmVudFR5cGUoIHd4RVZUX1dF QlZJRVdfTE9BRCk7CiAgICAgU2V0RXZlbnRPYmplY3QoIHdpbiApOwogICAgIFNldElkKHdpbi0+ R2V0SWQoKSk7CiB9CkBAIC0xMjcsNiArMTMwLDE3IEBACiAgICAgU2V0SWQod2luLT5HZXRJZCgp KTsKIH0KIAorSU1QTEVNRU5UX0RZTkFNSUNfQ0xBU1Mod3hXZWJWaWV3Q29uc29sZU1lc3NhZ2VF dmVudCwgd3hDb21tYW5kRXZlbnQpCisKK0RFRklORV9FVkVOVF9UWVBFKHd4RVZUX1dFQlZJRVdf Q09OU09MRV9NRVNTQUdFKQorCit3eFdlYlZpZXdDb25zb2xlTWVzc2FnZUV2ZW50Ojp3eFdlYlZp ZXdDb25zb2xlTWVzc2FnZUV2ZW50KHd4V2luZG93KiB3aW4pCit7CisgICAgU2V0RXZlbnRUeXBl KHd4RVZUX1dFQlZJRVdfQ09OU09MRV9NRVNTQUdFKTsKKyAgICBTZXRFdmVudE9iamVjdCh3aW4p OworICAgIFNldElkKHdpbi0+R2V0SWQoKSk7Cit9CisKIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAvLyBET00gRWxlbWVudCBpbmZv IGRhdGEgdHlwZQogLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KQEAgLTE4Myw3ICsxOTcsNyBAQAogICAgIH0KICAgICBlbHNlIHsKICAg ICAgICAgV2ViQ29yZTo6RWRpdG9yQ2xpZW50V3gqIGVkaXRvckNsaWVudCA9IG5ldyBXZWJDb3Jl OjpFZGl0b3JDbGllbnRXeCgpOwotICAgICAgICBtX2ltcGwtPnBhZ2UgPSBuZXcgV2ViQ29yZTo6 UGFnZShuZXcgV2ViQ29yZTo6Q2hyb21lQ2xpZW50V3goKSwgbmV3IFdlYkNvcmU6OkNvbnRleHRN ZW51Q2xpZW50V3goKSwgZWRpdG9yQ2xpZW50LCBuZXcgV2ViQ29yZTo6RHJhZ0NsaWVudFd4KCks IG5ldyBXZWJDb3JlOjpJbnNwZWN0b3JDbGllbnRXeCgpKTsKKyAgICAgICAgbV9pbXBsLT5wYWdl ID0gbmV3IFdlYkNvcmU6OlBhZ2UobmV3IFdlYkNvcmU6OkNocm9tZUNsaWVudFd4KHRoaXMpLCBu ZXcgV2ViQ29yZTo6Q29udGV4dE1lbnVDbGllbnRXeCgpLCBlZGl0b3JDbGllbnQsIG5ldyBXZWJD b3JlOjpEcmFnQ2xpZW50V3goKSwgbmV3IFdlYkNvcmU6Okluc3BlY3RvckNsaWVudFd4KCkpOwog ICAgICAgICBlZGl0b3JDbGllbnQtPnNldFBhZ2UobV9pbXBsLT5wYWdlKTsKICAgICB9CiAgICAg CkBAIC0yNDMsNiArMjU3LDkgQEAKIHd4U3RyaW5nIHd4V2ViVmlldzo6R2V0UGFnZVNvdXJjZSgp CiB7CiAgICAgaWYgKG1faW1wbC0+ZnJhbWUpIHsKKyAgICAgICAgaWYgKG1faW1wbC0+ZnJhbWVW aWV3ICYmIG1faW1wbC0+ZnJhbWVWaWV3LT5sYXlvdXRQZW5kaW5nKCkpCisgICAgICAgICAgICBt X2ltcGwtPmZyYW1lVmlldy0+bGF5b3V0KCk7CisgICAgCiAgICAgICAgIFdlYkNvcmU6OkRvY3Vt ZW50KiBkb2MgPSBtX2ltcGwtPmZyYW1lLT5kb2N1bWVudCgpOwogICAgICAgICAKICAgICAgICAg aWYgKGRvYykgewpAQCAtMjYzLDYgKzI4MCwzMSBAQAogICAgIH0KIH0KIAord3hTdHJpbmcgd3hX ZWJWaWV3OjpHZXRJbm5lclRleHQoKQoreworICAgIGlmIChtX2ltcGwtPmZyYW1lVmlldyAmJiBt X2ltcGwtPmZyYW1lVmlldy0+bGF5b3V0UGVuZGluZygpKQorICAgICAgICBtX2ltcGwtPmZyYW1l Vmlldy0+bGF5b3V0KCk7CisgICAgICAgIAorICAgIFdlYkNvcmU6OkVsZW1lbnQgKmRvY3VtZW50 RWxlbWVudCA9IG1faW1wbC0+ZnJhbWUtPmRvY3VtZW50KCktPmRvY3VtZW50RWxlbWVudCgpOwor ICAgIHJldHVybiBkb2N1bWVudEVsZW1lbnQtPmlubmVyVGV4dCgpOworfQorCit3eFN0cmluZyB3 eFdlYlZpZXc6OkdldEFzTWFya3VwKCkKK3sKKyAgICBpZiAoIW1faW1wbC0+ZnJhbWUgfHwgIW1f aW1wbC0+ZnJhbWUtPmRvY3VtZW50KCkpCisgICAgICAgIHJldHVybiB3eEVtcHR5U3RyaW5nOwor CisgICAgcmV0dXJuIGNyZWF0ZU1hcmt1cChtX2ltcGwtPmZyYW1lLT5kb2N1bWVudCgpKTsKK30K Kword3hTdHJpbmcgd3hXZWJWaWV3OjpHZXRFeHRlcm5hbFJlcHJlc2VudGF0aW9uKCkKK3sKKyAg ICBpZiAobV9pbXBsLT5mcmFtZVZpZXcgJiYgbV9pbXBsLT5mcmFtZVZpZXctPmxheW91dFBlbmRp bmcoKSkKKyAgICAgICAgbV9pbXBsLT5mcmFtZVZpZXctPmxheW91dCgpOworCisgICAgcmV0dXJu IGV4dGVybmFsUmVwcmVzZW50YXRpb24obV9pbXBsLT5mcmFtZS0+cmVuZGVyZXIoKSk7Cit9CisK IHd4U3RyaW5nIHd4V2ViVmlldzo6UnVuU2NyaXB0KGNvbnN0IHd4U3RyaW5nJiBqYXZhc2NyaXB0 KQogewogICAgIHd4U3RyaW5nIHJldHVyblZhbHVlID0gd3hFbXB0eVN0cmluZzsKSW5kZXg6IFdl YktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3guY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50V3guY3BwCShyZXZp c2lvbiAyOTQ0MykKKysrIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50 V3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNDgsNyArMjQ4LDEzIEBACiAKIHZvaWQgRnJhbWVM b2FkZXJDbGllbnRXeDo6ZGlzcGF0Y2hEaWRIYW5kbGVPbmxvYWRFdmVudHMoKQogewotICAgIG5v dEltcGxlbWVudGVkKCk7CisgICAgd3hXaW5kb3cqIHRhcmdldCA9IG1fZnJhbWUtPnZpZXcoKS0+ bmF0aXZlV2luZG93KCk7CisgICAgaWYgKHRhcmdldCkgeworICAgICAgICB3eFdlYlZpZXdMb2Fk RXZlbnQgd2tFdmVudCh0YXJnZXQpOworICAgICAgICB3a0V2ZW50LlNldFN0YXRlKHd4V0VCVklF V19MT0FEX09OTE9BRF9IQU5ETEVEKTsKKyAgICAgICAgd2tFdmVudC5TZXRVUkwobV9mcmFtZS0+ bG9hZGVyKCktPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKS0+cmVxdWVzdCgpLnVybCgpLnN0 cmluZygpKTsKKyAgICAgICAgdGFyZ2V0LT5HZXRFdmVudEhhbmRsZXIoKS0+UHJvY2Vzc0V2ZW50 KHdrRXZlbnQpOworICAgIH0KIH0KIAogCkBAIC0yODgsOCArMjk0LDggQEAKIHsKICAgICB3eFdp bmRvdyogdGFyZ2V0ID0gbV9mcmFtZS0+dmlldygpLT5uYXRpdmVXaW5kb3coKTsKICAgICBpZiAo dGFyZ2V0KSB7Ci0gICAgICAgIHd4V2ViVmlld1N0YXRlQ2hhbmdlZEV2ZW50IHdrRXZlbnQodGFy Z2V0KTsKLSAgICAgICAgd2tFdmVudC5TZXRTdGF0ZSh3eFdFQlZJRVdfU1RBVEVfTkVHT1RJQVRJ TkcpOworICAgICAgICB3eFdlYlZpZXdMb2FkRXZlbnQgd2tFdmVudCh0YXJnZXQpOworICAgICAg ICB3a0V2ZW50LlNldFN0YXRlKHd4V0VCVklFV19MT0FEX05FR09USUFUSU5HKTsKICAgICAgICAg d2tFdmVudC5TZXRVUkwobV9mcmFtZS0+bG9hZGVyKCktPnByb3Zpc2lvbmFsRG9jdW1lbnRMb2Fk ZXIoKS0+cmVxdWVzdCgpLnVybCgpLnN0cmluZygpKTsKICAgICAgICAgdGFyZ2V0LT5HZXRFdmVu dEhhbmRsZXIoKS0+UHJvY2Vzc0V2ZW50KHdrRXZlbnQpOwogICAgIH0KQEAgLTMwOCw4ICszMTQs OCBAQAogewogICAgIHd4V2luZG93KiB0YXJnZXQgPSBtX2ZyYW1lLT52aWV3KCktPm5hdGl2ZVdp bmRvdygpOwogICAgIGlmICh0YXJnZXQpIHsKLSAgICAgICAgd3hXZWJWaWV3U3RhdGVDaGFuZ2Vk RXZlbnQgd2tFdmVudCh0YXJnZXQpOwotICAgICAgICB3a0V2ZW50LlNldFN0YXRlKHd4V0VCVklF V19TVEFURV9UUkFOU0ZFUlJJTkcpOworICAgICAgICB3eFdlYlZpZXdMb2FkRXZlbnQgd2tFdmVu dCh0YXJnZXQpOworICAgICAgICB3a0V2ZW50LlNldFN0YXRlKHd4V0VCVklFV19MT0FEX1RSQU5T RkVSUklORyk7CiAgICAgICAgIHdrRXZlbnQuU2V0VVJMKG1fZnJhbWUtPmxvYWRlcigpLT5kb2N1 bWVudExvYWRlcigpLT5yZXF1ZXN0KCkudXJsKCkuc3RyaW5nKCkpOwogICAgICAgICB0YXJnZXQt PkdldEV2ZW50SGFuZGxlcigpLT5Qcm9jZXNzRXZlbnQod2tFdmVudCk7CiAgICAgfQpAQCAtMzE5 LDggKzMyNSw4IEBACiB7CiAgICAgd3hXaW5kb3cqIHRhcmdldCA9IG1fZnJhbWUtPnZpZXcoKS0+ bmF0aXZlV2luZG93KCk7CiAgICAgaWYgKHRhcmdldCkgewotICAgICAgICB3eFdlYlZpZXdTdGF0 ZUNoYW5nZWRFdmVudCB3a0V2ZW50KHRhcmdldCk7Ci0gICAgICAgIHdrRXZlbnQuU2V0U3RhdGUo d3hXRUJWSUVXX1NUQVRFX1NUT1ApOworICAgICAgICB3eFdlYlZpZXdMb2FkRXZlbnQgd2tFdmVu dCh0YXJnZXQpOworICAgICAgICB3a0V2ZW50LlNldFN0YXRlKHd4V0VCVklFV19MT0FEX0RPQ19D T01QTEVURUQpOwogICAgICAgICB3a0V2ZW50LlNldFVSTChtX2ZyYW1lLT5sb2FkZXIoKS0+dXJs KCkuc3RyaW5nKCkpOwogICAgICAgICB0YXJnZXQtPkdldEV2ZW50SGFuZGxlcigpLT5Qcm9jZXNz RXZlbnQod2tFdmVudCk7CiAgICAgfQpAQCAtMzkxLDggKzM5Nyw4IEBACiB7CiAgICAgd3hXaW5k b3cqIHRhcmdldCA9IG1fZnJhbWUtPnZpZXcoKS0+bmF0aXZlV2luZG93KCk7CiAgICAgaWYgKHRh cmdldCkgewotICAgICAgICB3eFdlYlZpZXdTdGF0ZUNoYW5nZWRFdmVudCB3a0V2ZW50KHRhcmdl dCk7Ci0gICAgICAgIHdrRXZlbnQuU2V0U3RhdGUod3hXRUJWSUVXX1NUQVRFX1NUT1ApOworICAg ICAgICB3eFdlYlZpZXdMb2FkRXZlbnQgd2tFdmVudCh0YXJnZXQpOworICAgICAgICB3a0V2ZW50 LlNldFN0YXRlKHd4V0VCVklFV19MT0FEX0RMX0NPTVBMRVRFRCk7CiAgICAgICAgIHdrRXZlbnQu U2V0VVJMKG1fZnJhbWUtPmxvYWRlcigpLT51cmwoKS5zdHJpbmcoKSk7CiAgICAgICAgIHRhcmdl dC0+R2V0RXZlbnRIYW5kbGVyKCktPlByb2Nlc3NFdmVudCh3a0V2ZW50KTsKICAgICB9CkluZGV4 OiBXZWJLaXQvd3gvV2ViS2l0U3VwcG9ydC9DaHJvbWVDbGllbnRXeC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0Nocm9tZUNsaWVudFd4LmgJKHJldmlzaW9uIDI5NDQz KQorKysgV2ViS2l0L3d4L1dlYktpdFN1cHBvcnQvQ2hyb21lQ2xpZW50V3guaAkod29ya2luZyBj b3B5KQpAQCAtMzcsNiArMzcsNyBAQAogCiBjbGFzcyBDaHJvbWVDbGllbnRXeCA6IHB1YmxpYyBD aHJvbWVDbGllbnQgewogcHVibGljOgorICAgIENocm9tZUNsaWVudFd4KHd4V2ViVmlldyopOwog ICAgIHZpcnR1YWwgfkNocm9tZUNsaWVudFd4KCk7CiAgICAgdmlydHVhbCB2b2lkIGNocm9tZURl c3Ryb3llZCgpOwogCkBAIC0xMDUsNiArMTA2LDkgQEAKIAogICAgIHZpcnR1YWwgdW5zaWduZWQg bG9uZyBsb25nIHJlcXVlc3RRdW90YUluY3JlYXNlRm9yTmV3RGF0YWJhc2UoRnJhbWUqLCBTZWN1 cml0eU9yaWdpbiosIGNvbnN0IFN0cmluZyYsIHVuc2lnbmVkIGxvbmcgbG9uZyk7CiAgICAgdmly dHVhbCB1bnNpZ25lZCBsb25nIGxvbmcgcmVxdWVzdFF1b3RhSW5jcmVhc2VGb3JEYXRhYmFzZU9w ZXJhdGlvbihGcmFtZSosIFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU3RyaW5nJiwgdW5zaWduZWQg bG9uZyBsb25nKTsgICAgCisKK3ByaXZhdGU6CisgICAgd3hXZWJWaWV3KiBtX3dlYlZpZXc7CiB9 OwogCiB9CkluZGV4OiBXZWJLaXQvd3gvV2ViS2l0U3VwcG9ydC9DaHJvbWVDbGllbnRXeC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L3d4L1dlYktpdFN1cHBvcnQvQ2hyb21lQ2xpZW50V3guY3Bw CShyZXZpc2lvbiAyOTQ0MykKKysrIFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0Nocm9tZUNsaWVu dFd4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsMTEgQEAKIAogbmFtZXNwYWNlIFdl YkNvcmUgewogCitDaHJvbWVDbGllbnRXeDo6Q2hyb21lQ2xpZW50V3god3hXZWJWaWV3KiB3ZWJW aWV3KQoreworICAgIG1fd2ViVmlldyA9IHdlYlZpZXc7Cit9CisKIENocm9tZUNsaWVudFd4Ojp+ Q2hyb21lQ2xpZW50V3goKQogewogfQpAQCAtMTkyLDExICsxOTcsMTcgQEAKICAgICBub3RJbXBs ZW1lbnRlZCgpOwogfQogCi12b2lkIENocm9tZUNsaWVudFd4OjphZGRNZXNzYWdlVG9Db25zb2xl KGNvbnN0IFN0cmluZyYsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB1bnNpZ25lZCBpbnQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBTdHJpbmcmKQordm9pZCBDaHJvbWVDbGllbnRXeDo6YWRkTWVzc2FnZVRvQ29uc29s ZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB1bnNpZ25lZCBpbnQgbGluZU51bWJlciwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IFN0cmluZyYgc291cmNlSUQpCiB7Ci0gICAgbm90 SW1wbGVtZW50ZWQoKTsKKyAgICBpZiAobV93ZWJWaWV3KSB7CisgICAgICAgIHd4V2ViVmlld0Nv bnNvbGVNZXNzYWdlRXZlbnQgd2tFdmVudChtX3dlYlZpZXcpOworICAgICAgICB3a0V2ZW50LlNl dE1lc3NhZ2UobWVzc2FnZSk7CisgICAgICAgIHdrRXZlbnQuU2V0TGluZU51bWJlcihsaW5lTnVt YmVyKTsKKyAgICAgICAgd2tFdmVudC5TZXRTb3VyY2VJRChzb3VyY2VJRCk7CisgICAgICAgIG1f d2ViVmlldy0+R2V0RXZlbnRIYW5kbGVyKCktPlByb2Nlc3NFdmVudCh3a0V2ZW50KTsKKyAgICB9 CiB9CiAKIGJvb2wgQ2hyb21lQ2xpZW50V3g6OmNhblJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5l bCgpCg==