33157 2010-01-04 10:47:35 -0800 Implement TextInput logging channel on Windows 2010-01-04 13:27:26 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 ap ap webkit.review.bot oldest_to_newest 176744 0 ap 2010-01-04 10:47:35 -0800 I'd like to have a logging facility for IME on Windows, too. 176752 1 45806 ap 2010-01-04 10:53:11 -0800 Created attachment 45806 proposed patch 176756 2 webkit.review.bot 2010-01-04 10:58:17 -0800 style-queue ran check-webkit-style on attachment 45806 without any errors. 176843 3 ap 2010-01-04 13:27:26 -0800 Committed revision 52754. 45806 2010-01-04 10:53:11 -0800 2010-01-04 13:25:55 -0800 proposed patch TextInputLogging.txt text/plain 12445 ap SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA1Mjc0NikKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTAtMDEtMDQgIEFsZXhleSBQcm9za3VyeWFrb3Yg IDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMzMTU3Cisg ICAgICAgIEltcGxlbWVudCBUZXh0SW5wdXQgbG9nZ2luZyBjaGFubmVsIG9uIFdpbmRvd3MKKwor ICAgICAgICAqIFdlYktpdExvZ2dpbmcuY3BwOiAoV2ViS2l0SW5pdGlhbGl6ZUxvZ2dpbmdDaGFu bmVsc0lmTmVjZXNzYXJ5KToKKyAgICAgICAgKiBXZWJLaXRMb2dnaW5nLmg6CisgICAgICAgIEFk ZGVkIGEgVGV4dElucHV0IGNoYW5uZWwgaW4gcGxhY2Ugb2YgdW51c2VkIE5ldHdvcmsgb25lLgor CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpXZWJWaWV3V25kUHJv Yyk6IENoYW5nZWQgb25JTUVSZXF1ZXN0IHRvIHJldHVybiByZXN1bHQgZGlyZWN0bHkuIFdlIG5l dmVyIGZvcndhcmQKKyAgICAgICAgaXQgdG8gRGVmV2luZG93UHJvYywgc28gdGhlcmUgaXMgbm8g bmVlZCB0byByZXR1cm4gYW4gdW51c2VkIGJvb2xlYW4gcmVzdWx0IGZvciAiaGFuZGxlZCIuCisg ICAgICAgIChXZWJWaWV3OjpvbklNRVN0YXJ0Q29tcG9zaXRpb24pOiBBZGRlZCBsb2dnaW5nLgor ICAgICAgICAoaW1lQ29tcG9zaXRpb25Bcmd1bWVudE5hbWVzKTogQSBoZWxwZXIgZnVuY3Rpb24g Zm9yIGRldGFpbGVkIGxvZ2dpbmcgaW4gb25JTUVDb21wb3NpdGlvbi4KKyAgICAgICAgKGltZU5v dGlmaWNhdGlvbk5hbWUpOiBBIGhlbHBlciBmdW5jdGlvbiBmb3IgZGV0YWlsZWQgbG9nZ2luZyBp biBvbklNRU5vdGlmeS4KKyAgICAgICAgKGltZVJlcXVlc3ROYW1lKTogQSBoZWxwZXIgZnVuY3Rp b24gZm9yIGRldGFpbGVkIGxvZ2dpbmcgaW4gb25JTUVSZXF1ZXN0LgorICAgICAgICAoV2ViVmll dzo6b25JTUVDb21wb3NpdGlvbik6IEFkZGVkIGxvZ2dpbmcuCisgICAgICAgIChXZWJWaWV3Ojpv bklNRUVuZENvbXBvc2l0aW9uKTogRGl0dG8uCisgICAgICAgIChXZWJWaWV3OjpvbklNRUNoYXIp OiBEaXR0by4KKyAgICAgICAgKFdlYlZpZXc6Om9uSU1FTm90aWZ5KTogRGl0dG8uCisgICAgICAg IChXZWJWaWV3OjpvbklNRVJlcXVlc3RDaGFyUG9zaXRpb24pOiBDaGFuZ2VkIHRvIHJldHVybiBy ZXN1bHQgZGlyZWN0bHkuCisgICAgICAgIChXZWJWaWV3OjpvbklNRVJlcXVlc3RSZWNvbnZlcnRT dHJpbmcpOiBEaXR0by4KKyAgICAgICAgKFdlYlZpZXc6Om9uSU1FUmVxdWVzdCk6IENoYW5nZWQg dG8gcmV0dXJuIHJlc3VsdCBkaXJlY3RseS4gQWRkZWQgbG9nZ2luZy4KKyAgICAgICAgKFdlYlZp ZXc6Om9uSU1FU2VsZWN0KTogQWRkZWQgbG9nZ2luZy4KKyAgICAgICAgKFdlYlZpZXc6Om9uSU1F U2V0Q29udGV4dCk6IEFkZGVkIGxvZ2dpbmcuCisKKyAgICAgICAgKiBXZWJWaWV3Lmg6IG9uSU1F UmVxdWVzdCBmdW5jdGlvbnMgbm93IHJldHVybiByZXN1bHQgZGlyZWN0bHkuCisKIDIwMDktMTIt MjIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFub3RoZXIgdHJ5 IGF0IGZpeGluZyBXaW5kb3dzIGJ1aWxkLgpJbmRleDogV2ViS2l0L3dpbi9XZWJLaXRMb2dnaW5n LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL1dlYktpdExvZ2dpbmcuY3BwCShyZXZpc2lv biA1MjUyNikKKysrIFdlYktpdC93aW4vV2ViS2l0TG9nZ2luZy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI5LDcgKzI5LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJLaXRM b2dnaW5nLmgiCiAKLVdURkxvZ0NoYW5uZWwgV2ViS2l0TG9nTmV0d29yayA9ICAgICAgICAgICAg ICAgIHsgMHgwMDAwMDAxMCwgIldlYktpdExvZ0xldmVsIiwgV1RGTG9nQ2hhbm5lbE9mZiB9Owor V1RGTG9nQ2hhbm5lbCBXZWJLaXRMb2dUZXh0SW5wdXQgPSAgICAgICAgICAgICAgeyAweDAwMDAw MDEwLCAiV2ViS2l0TG9nTGV2ZWwiLCBXVEZMb2dDaGFubmVsT2ZmIH07CiBXVEZMb2dDaGFubmVs IFdlYktpdExvZ1RpbWluZyA9ICAgICAgICAgICAgICAgICB7IDB4MDAwMDAwMjAsICJXZWJLaXRM b2dMZXZlbCIsIFdURkxvZ0NoYW5uZWxPZmYgfTsKIFdURkxvZ0NoYW5uZWwgV2ViS2l0TG9nTG9h ZGluZyA9ICAgICAgICAgICAgICAgIHsgMHgwMDAwMDA0MCwgIldlYktpdExvZ0xldmVsIiwgV1RG TG9nQ2hhbm5lbE9mZiB9OwogV1RGTG9nQ2hhbm5lbCBXZWJLaXRMb2dGb250Q2FjaGUgPSAgICAg ICAgICAgICAgeyAweDAwMDAwMTAwLCAiV2ViS2l0TG9nTGV2ZWwiLCBXVEZMb2dDaGFubmVsT2Zm IH07CkBAIC03OCw2ICs3OCw3IEBAIHZvaWQgV2ViS2l0SW5pdGlhbGl6ZUxvZ2dpbmdDaGFubmVs c0lmTmUKICAgICAgICAgcmV0dXJuOwogICAgIGhhdmVJbml0aWFsaXplZExvZ2dpbmdDaGFubmVs cyA9IHRydWU7CiAgICAgCisgICAgaW5pdGlhbGl6ZUxvZ0NoYW5uZWwoJldlYktpdExvZ1RleHRJ bnB1dCk7CiAgICAgaW5pdGlhbGl6ZUxvZ0NoYW5uZWwoJldlYktpdExvZ1RpbWluZyk7CiAgICAg aW5pdGlhbGl6ZUxvZ0NoYW5uZWwoJldlYktpdExvZ0xvYWRpbmcpOwogICAgIGluaXRpYWxpemVM b2dDaGFubmVsKCZXZWJLaXRMb2dGb250Q2FjaGUpOwpJbmRleDogV2ViS2l0L3dpbi9XZWJLaXRM b2dnaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3dpbi9XZWJLaXRMb2dnaW5nLmgJKHJldmlz aW9uIDUyNTI2KQorKysgV2ViS2l0L3dpbi9XZWJLaXRMb2dnaW5nLmgJKHdvcmtpbmcgY29weSkK QEAgLTM2LDcgKzM2LDcgQEAKICNlbmRpZgogCiAKLWV4dGVybiBXVEZMb2dDaGFubmVsIFdlYktp dExvZ05ldHdvcms7CitleHRlcm4gV1RGTG9nQ2hhbm5lbCBXZWJLaXRMb2dUZXh0SW5wdXQ7CiBl eHRlcm4gV1RGTG9nQ2hhbm5lbCBXZWJLaXRMb2dUaW1pbmc7CiBleHRlcm4gV1RGTG9nQ2hhbm5l bCBXZWJLaXRMb2dMb2FkaW5nOwogZXh0ZXJuIFdURkxvZ0NoYW5uZWwgV2ViS2l0TG9nRm9udENh Y2hlOwpJbmRleDogV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv d2luL1dlYlZpZXcuY3BwCShyZXZpc2lvbiA1MjUyNikKKysrIFdlYktpdC93aW4vV2ViVmlldy5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDYgKzQ2LDcgQEAKICNpbmNsdWRlICJXZWJJbnNwZWN0 b3IuaCIKICNpbmNsdWRlICJXZWJJbnNwZWN0b3JDbGllbnQuaCIKICNpbmNsdWRlICJXZWJLaXQu aCIKKyNpbmNsdWRlICJXZWJLaXRMb2dnaW5nLmgiCiAjaW5jbHVkZSAiV2ViS2l0U3RhdGlzdGlj c1ByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJLaXRTeXN0ZW1CaXRzLmgiCiAjaW5jbHVkZSAiV2Vi TXV0YWJsZVVSTFJlcXVlc3QuaCIKQEAgLTIxMDAsNyArMjEwMSw3IEBAIExSRVNVTFQgQ0FMTEJB Q0sgV2ViVmlldzo6V2ViVmlld1duZFByb2MKICAgICAgICAgICAgIGhhbmRsZWQgPSB3ZWJWaWV3 LT5vbklNRVN0YXJ0Q29tcG9zaXRpb24oKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBj YXNlIFdNX0lNRV9SRVFVRVNUOgotICAgICAgICAgICAgd2ViVmlldy0+b25JTUVSZXF1ZXN0KHdQ YXJhbSwgbFBhcmFtLCAmbFJlc3VsdCk7CisgICAgICAgICAgICBsUmVzdWx0ID0gd2ViVmlldy0+ b25JTUVSZXF1ZXN0KHdQYXJhbSwgbFBhcmFtKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICBjYXNlIFdNX0lNRV9DT01QT1NJVElPTjoKICAgICAgICAgICAgIGhhbmRsZWQgPSB3ZWJWaWV3 LT5vbklNRUNvbXBvc2l0aW9uKGxQYXJhbSk7CkBAIC01MDcyLDYgKzUwNzMsNyBAQCB2b2lkIFdl YlZpZXc6OnNlbGVjdGlvbkNoYW5nZWQoKQogCiBib29sIFdlYlZpZXc6Om9uSU1FU3RhcnRDb21w b3NpdGlvbigpCiB7CisgICAgTE9HKFRleHRJbnB1dCwgIm9uSU1FU3RhcnRDb21wb3NpdGlvbiIp OwogICAgIG1faW5JTUVDb21wb3NpdGlvbisrOwogICAgIEZyYW1lKiB0YXJnZXRGcmFtZSA9IG1f cGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpOwogICAgIGlmICgh dGFyZ2V0RnJhbWUpCkBAIC01MTE0LDggKzUxMTYsMTAwIEBAIHN0YXRpYyB2b2lkIGNvbXBvc2l0 aW9uVG9VbmRlcmxpbmVzKGNvbnMKICAgICB9CiB9CiAKKyNpZiAhTE9HX0RJU0FCTEVECisjZGVm aW5lIEFQUEVORF9BUkdVTUVOVF9OQU1FKG5hbWUpIFwKKyAgICBpZiAobHBhcmFtICYgbmFtZSkg eyBcCisgICAgICAgIGlmIChuZWVkc0NvbW1hKSBcCisgICAgICAgICAgICByZXN1bHQgKz0gIiwg IjsgXAorICAgICAgICAgICAgcmVzdWx0ICs9ICNuYW1lOyBcCisgICAgICAgIG5lZWRzQ29tbWEg PSB0cnVlOyBcCisgICAgfQorCitzdGF0aWMgU3RyaW5nIGltZUNvbXBvc2l0aW9uQXJndW1lbnRO YW1lcyhMUEFSQU0gbHBhcmFtKQoreworICAgIFN0cmluZyByZXN1bHQ7CisgICAgYm9vbCBuZWVk c0NvbW1hID0gZmFsc2U7CisgICAgaWYgKGxwYXJhbSAmIEdDU19DT01QQVRUUikgeworICAgICAg ICByZXN1bHQgPSAiR0NTX0NPTVBBVFRSIjsKKyAgICAgICAgbmVlZHNDb21tYSA9IHRydWU7Cisg ICAgfQorICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19DT01QQ0xBVVNFKTsKKyAgICBBUFBF TkRfQVJHVU1FTlRfTkFNRShHQ1NfQ09NUFJFQURTVFIpOworICAgIEFQUEVORF9BUkdVTUVOVF9O QU1FKEdDU19DT01QUkVBREFUVFIpOworICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19DT01Q UkVBRENMQVVTRSk7CisgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUoR0NTX0NPTVBTVFIpOworICAg IEFQUEVORF9BUkdVTUVOVF9OQU1FKEdDU19DVVJTT1JQT1MpOworICAgIEFQUEVORF9BUkdVTUVO VF9OQU1FKEdDU19ERUxUQVNUQVJUKTsKKyAgICBBUFBFTkRfQVJHVU1FTlRfTkFNRShHQ1NfUkVT VUxUQ0xBVVNFKTsKKyAgICBBUFBFTkRfQVJHVU1FTlRfTkFNRShHQ1NfUkVTVUxUUkVBRENMQVVT RSk7CisgICAgQVBQRU5EX0FSR1VNRU5UX05BTUUoR0NTX1JFU1VMVFJFQURTVFIpOworICAgIEFQ UEVORF9BUkdVTUVOVF9OQU1FKEdDU19SRVNVTFRTVFIpOworICAgIEFQUEVORF9BUkdVTUVOVF9O QU1FKENTX0lOU0VSVENIQVIpOworICAgIEFQUEVORF9BUkdVTUVOVF9OQU1FKENTX05PTU9WRUNB UkVUKTsKKworICAgIHJldHVybiByZXN1bHQ7Cit9CisKK3N0YXRpYyBTdHJpbmcgaW1lTm90aWZp Y2F0aW9uTmFtZShXUEFSQU0gd3BhcmFtKQoreworICAgIHN3aXRjaCAod3BhcmFtKSB7CisgICAg Y2FzZSBJTU5fQ0hBTkdFQ0FORElEQVRFOgorICAgICAgICByZXR1cm4gIklNTl9DSEFOR0VDQU5E SURBVEUiOworICAgIGNhc2UgSU1OX0NMT1NFQ0FORElEQVRFOgorICAgICAgICByZXR1cm4gIklN Tl9DTE9TRUNBTkRJREFURSI7CisgICAgY2FzZSBJTU5fQ0xPU0VTVEFUVVNXSU5ET1c6CisgICAg ICAgIHJldHVybiAiSU1OX0NMT1NFU1RBVFVTV0lORE9XIjsKKyAgICBjYXNlIElNTl9HVUlERUxJ TkU6CisgICAgICAgIHJldHVybiAiSU1OX0dVSURFTElORSI7CisgICAgY2FzZSBJTU5fT1BFTkNB TkRJREFURToKKyAgICAgICAgcmV0dXJuICJJTU5fT1BFTkNBTkRJREFURSI7CisgICAgY2FzZSBJ TU5fT1BFTlNUQVRVU1dJTkRPVzoKKyAgICAgICAgcmV0dXJuICJJTU5fT1BFTlNUQVRVU1dJTkRP VyI7CisgICAgY2FzZSBJTU5fU0VUQ0FORElEQVRFUE9TOgorICAgICAgICByZXR1cm4gIklNTl9T RVRDQU5ESURBVEVQT1MiOworICAgIGNhc2UgSU1OX1NFVENPTVBPU0lUSU9ORk9OVDoKKyAgICAg ICAgcmV0dXJuICJJTU5fU0VUQ09NUE9TSVRJT05GT05UIjsKKyAgICBjYXNlIElNTl9TRVRDT01Q T1NJVElPTldJTkRPVzoKKyAgICAgICAgcmV0dXJuICJJTU5fU0VUQ09NUE9TSVRJT05XSU5ET1ci OworICAgIGNhc2UgSU1OX1NFVENPTlZFUlNJT05NT0RFOgorICAgICAgICByZXR1cm4gIklNTl9T RVRDT05WRVJTSU9OTU9ERSI7CisgICAgY2FzZSBJTU5fU0VUT1BFTlNUQVRVUzoKKyAgICAgICAg cmV0dXJuICJJTU5fU0VUT1BFTlNUQVRVUyI7CisgICAgY2FzZSBJTU5fU0VUU0VOVEVOQ0VNT0RF OgorICAgICAgICByZXR1cm4gIklNTl9TRVRTRU5URU5DRU1PREUiOworICAgIGNhc2UgSU1OX1NF VFNUQVRVU1dJTkRPV1BPUzoKKyAgICAgICAgcmV0dXJuICJJTU5fU0VUU1RBVFVTV0lORE9XUE9T IjsKKyAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gIlVua25vd24gKCIgKyBTdHJpbmc6Om51 bWJlcih3cGFyYW0pICsgIikiOworICAgIH0KK30KKworc3RhdGljIFN0cmluZyBpbWVSZXF1ZXN0 TmFtZShXUEFSQU0gd3BhcmFtKQoreworICAgIHN3aXRjaCAod3BhcmFtKSB7CisgICAgY2FzZSBJ TVJfQ0FORElEQVRFV0lORE9XOgorICAgICAgICByZXR1cm4gIklNUl9DQU5ESURBVEVXSU5ET1ci OworICAgIGNhc2UgSU1SX0NPTVBPU0lUSU9ORk9OVDoKKyAgICAgICAgcmV0dXJuICJJTVJfQ09N UE9TSVRJT05GT05UIjsKKyAgICBjYXNlIElNUl9DT01QT1NJVElPTldJTkRPVzoKKyAgICAgICAg cmV0dXJuICJJTVJfQ09NUE9TSVRJT05XSU5ET1ciOworICAgIGNhc2UgSU1SX0NPTkZJUk1SRUNP TlZFUlRTVFJJTkc6CisgICAgICAgIHJldHVybiAiSU1SX0NPTkZJUk1SRUNPTlZFUlRTVFJJTkci OworICAgIGNhc2UgSU1SX0RPQ1VNRU5URkVFRDoKKyAgICAgICAgcmV0dXJuICJJTVJfRE9DVU1F TlRGRUVEIjsKKyAgICBjYXNlIElNUl9RVUVSWUNIQVJQT1NJVElPTjoKKyAgICAgICAgcmV0dXJu ICJJTVJfUVVFUllDSEFSUE9TSVRJT04iOworICAgIGNhc2UgSU1SX1JFQ09OVkVSVFNUUklORzoK KyAgICAgICAgcmV0dXJuICJJTVJfUkVDT05WRVJUU1RSSU5HIjsKKyAgICBkZWZhdWx0OgorICAg ICAgICByZXR1cm4gIlVua25vd24gKCIgKyBTdHJpbmc6Om51bWJlcih3cGFyYW0pICsgIikiOwor ICAgIH0KK30KKyNlbmRpZgorCiBib29sIFdlYlZpZXc6Om9uSU1FQ29tcG9zaXRpb24oTFBBUkFN IGxwYXJhbSkKIHsKKyAgICBMT0coVGV4dElucHV0LCAib25JTUVDb21wb3NpdGlvbiAlcyIsIGlt ZUNvbXBvc2l0aW9uQXJndW1lbnROYW1lcyhscGFyYW0pLmxhdGluMSgpLmRhdGEoKSk7CiAgICAg SElNQyBoSW5wdXRDb250ZXh0ID0gZ2V0SU1NQ29udGV4dCgpOwogICAgIGlmICghaElucHV0Q29u dGV4dCkKICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC01MTYwLDIyICs1MjU0LDI4IEBAIGJvb2wg V2ViVmlldzo6b25JTUVDb21wb3NpdGlvbihMUEFSQU0gbHAKIAogYm9vbCBXZWJWaWV3OjpvbklN RUVuZENvbXBvc2l0aW9uKCkKIHsKKyAgICBMT0coVGV4dElucHV0LCAib25JTUVFbmRDb21wb3Np dGlvbiIpOwogICAgIGlmIChtX2luSU1FQ29tcG9zaXRpb24pIAogICAgICAgICBtX2luSU1FQ29t cG9zaXRpb24tLTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBXZWJWaWV3OjpvbklNRUNo YXIoV1BBUkFNLCBMUEFSQU0pCitib29sIFdlYlZpZXc6Om9uSU1FQ2hhcihXUEFSQU0gd3BhcmFt LCBMUEFSQU0gbHBhcmFtKQogeworICAgIFVOVVNFRF9QQVJBTSh3cGFyYW0pOworICAgIFVOVVNF RF9QQVJBTShscGFyYW0pOworICAgIExPRyhUZXh0SW5wdXQsICJvbklNRUNoYXIgVSslMDRYICUw OFgiLCB3cGFyYW0sIGxwYXJhbSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgV2ViVmll dzo6b25JTUVOb3RpZnkoV1BBUkFNLCBMUEFSQU0sIExSRVNVTFQqKQorYm9vbCBXZWJWaWV3Ojpv bklNRU5vdGlmeShXUEFSQU0gd3BhcmFtLCBMUEFSQU0sIExSRVNVTFQqKQogeworICAgIFVOVVNF RF9QQVJBTSh3cGFyYW0pOworICAgIExPRyhUZXh0SW5wdXQsICJvbklNRU5vdGlmeSAlcyIsIGlt ZU5vdGlmaWNhdGlvbk5hbWUod3BhcmFtKS5sYXRpbjEoKS5kYXRhKCkpOwogICAgIHJldHVybiBm YWxzZTsKIH0KIAotYm9vbCBXZWJWaWV3OjpvbklNRVJlcXVlc3RDaGFyUG9zaXRpb24oRnJhbWUq IHRhcmdldEZyYW1lLCBJTUVDSEFSUE9TSVRJT04qIGNoYXJQb3MsIExSRVNVTFQqIHJlc3VsdCkK K0xSRVNVTFQgV2ViVmlldzo6b25JTUVSZXF1ZXN0Q2hhclBvc2l0aW9uKEZyYW1lKiB0YXJnZXRG cmFtZSwgSU1FQ0hBUlBPU0lUSU9OKiBjaGFyUG9zKQogewogICAgIEludFJlY3QgY2FyZXQ7CiAg ICAgQVNTRVJUKGNoYXJQb3MtPmR3Q2hhclBvcyA9PSAwIHx8IHRhcmdldEZyYW1lLT5lZGl0b3Io KS0+aGFzQ29tcG9zaXRpb24oKSk7CkBAIC01MTkxLDU2ICs1MjkxLDU1IEBAIGJvb2wgV2ViVmll dzo6b25JTUVSZXF1ZXN0Q2hhclBvc2l0aW9uKEYKICAgICA6OkNsaWVudFRvU2NyZWVuKG1fdmll d1dpbmRvdywgJmNoYXJQb3MtPnB0KTsKICAgICBjaGFyUG9zLT5jTGluZUhlaWdodCA9IGNhcmV0 LmhlaWdodCgpOwogICAgIDo6R2V0V2luZG93UmVjdChtX3ZpZXdXaW5kb3csICZjaGFyUG9zLT5y Y0RvY3VtZW50KTsKLSAgICAqcmVzdWx0ID0gVFJVRTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAot Ym9vbCBXZWJWaWV3OjpvbklNRVJlcXVlc3RSZWNvbnZlcnRTdHJpbmcoRnJhbWUqIHRhcmdldEZy YW1lLCBSRUNPTlZFUlRTVFJJTkcqIHJlY29udmVydFN0cmluZywgTFJFU1VMVCogcmVzdWx0KQor TFJFU1VMVCBXZWJWaWV3OjpvbklNRVJlcXVlc3RSZWNvbnZlcnRTdHJpbmcoRnJhbWUqIHRhcmdl dEZyYW1lLCBSRUNPTlZFUlRTVFJJTkcqIHJlY29udmVydFN0cmluZykKIHsKICAgICBSZWZQdHI8 UmFuZ2U+IHNlbGVjdGVkUmFuZ2UgPSB0YXJnZXRGcmFtZS0+c2VsZWN0aW9uKCktPnRvTm9ybWFs aXplZFJhbmdlKCk7CiAgICAgU3RyaW5nIHRleHQgPSBzZWxlY3RlZFJhbmdlLT50ZXh0KCk7Ci0g ICAgaWYgKCFyZWNvbnZlcnRTdHJpbmcpIHsKLSAgICAgICAgKnJlc3VsdCA9IHNpemVvZihSRUNP TlZFUlRTVFJJTkcpICsgdGV4dC5sZW5ndGgoKSAqIHNpemVvZihVQ2hhcik7Ci0gICAgICAgIHJl dHVybiB0cnVlOwotICAgIH0KKyAgICBpZiAoIXJlY29udmVydFN0cmluZykKKyAgICAgICAgcmV0 dXJuIHNpemVvZihSRUNPTlZFUlRTVFJJTkcpICsgdGV4dC5sZW5ndGgoKSAqIHNpemVvZihVQ2hh cik7CiAKICAgICB1bnNpZ25lZCB0b3RhbFNpemUgPSBzaXplb2YoUkVDT05WRVJUU1RSSU5HKSAr IHRleHQubGVuZ3RoKCkgKiBzaXplb2YoVUNoYXIpOwotICAgICpyZXN1bHQgPSB0b3RhbFNpemU7 Ci0gICAgaWYgKHRvdGFsU2l6ZSA+IHJlY29udmVydFN0cmluZy0+ZHdTaXplKSB7Ci0gICAgICAg ICpyZXN1bHQgPSAwOwotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfQorICAgIGlmICh0b3Rh bFNpemUgPiByZWNvbnZlcnRTdHJpbmctPmR3U2l6ZSkKKyAgICAgICAgcmV0dXJuIDA7CiAgICAg cmVjb252ZXJ0U3RyaW5nLT5kd0NvbXBTdHJMZW4gPSB0ZXh0Lmxlbmd0aCgpOwogICAgIHJlY29u dmVydFN0cmluZy0+ZHdTdHJMZW4gPSB0ZXh0Lmxlbmd0aCgpOwogICAgIHJlY29udmVydFN0cmlu Zy0+ZHdUYXJnZXRTdHJMZW4gPSB0ZXh0Lmxlbmd0aCgpOwogICAgIHJlY29udmVydFN0cmluZy0+ ZHdTdHJPZmZzZXQgPSBzaXplb2YoUkVDT05WRVJUU1RSSU5HKTsKICAgICBtZW1jcHkocmVjb252 ZXJ0U3RyaW5nICsgMSwgdGV4dC5jaGFyYWN0ZXJzKCksIHRleHQubGVuZ3RoKCkgKiBzaXplb2Yo VUNoYXIpKTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gdG90YWxTaXplOwogfQogCi1i b29sIFdlYlZpZXc6Om9uSU1FUmVxdWVzdChXUEFSQU0gcmVxdWVzdCwgTFBBUkFNIGRhdGEsIExS RVNVTFQqIHJlc3VsdCkKK0xSRVNVTFQgV2ViVmlldzo6b25JTUVSZXF1ZXN0KFdQQVJBTSByZXF1 ZXN0LCBMUEFSQU0gZGF0YSkKIHsKKyAgICBMT0coVGV4dElucHV0LCAib25JTUVSZXF1ZXN0ICVz IiwgaW1lUmVxdWVzdE5hbWUocmVxdWVzdCkubGF0aW4xKCkuZGF0YSgpKTsKICAgICBGcmFtZSog dGFyZ2V0RnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJh bWUoKTsKICAgICBpZiAoIXRhcmdldEZyYW1lIHx8ICF0YXJnZXRGcmFtZS0+ZWRpdG9yKCktPmNh bkVkaXQoKSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiAwOwogCiAgICAg c3dpdGNoIChyZXF1ZXN0KSB7CiAgICAgICAgIGNhc2UgSU1SX1JFQ09OVkVSVFNUUklORzoKLSAg ICAgICAgICAgIHJldHVybiBvbklNRVJlcXVlc3RSZWNvbnZlcnRTdHJpbmcodGFyZ2V0RnJhbWUs IChSRUNPTlZFUlRTVFJJTkcqKWRhdGEsIHJlc3VsdCk7CisgICAgICAgICAgICByZXR1cm4gb25J TUVSZXF1ZXN0UmVjb252ZXJ0U3RyaW5nKHRhcmdldEZyYW1lLCAoUkVDT05WRVJUU1RSSU5HKilk YXRhKTsKIAogICAgICAgICBjYXNlIElNUl9RVUVSWUNIQVJQT1NJVElPTjoKLSAgICAgICAgICAg IHJldHVybiBvbklNRVJlcXVlc3RDaGFyUG9zaXRpb24odGFyZ2V0RnJhbWUsIChJTUVDSEFSUE9T SVRJT04qKWRhdGEsIHJlc3VsdCk7CisgICAgICAgICAgICByZXR1cm4gb25JTUVSZXF1ZXN0Q2hh clBvc2l0aW9uKHRhcmdldEZyYW1lLCAoSU1FQ0hBUlBPU0lUSU9OKilkYXRhKTsKICAgICB9Ci0g ICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiAwOwogfQogCi1ib29sIFdlYlZpZXc6Om9uSU1F U2VsZWN0KFdQQVJBTSwgTFBBUkFNKQorYm9vbCBXZWJWaWV3OjpvbklNRVNlbGVjdChXUEFSQU0g d3BhcmFtLCBMUEFSQU0gbHBhcmFtKQogeworICAgIFVOVVNFRF9QQVJBTSh3cGFyYW0pOworICAg IFVOVVNFRF9QQVJBTShscGFyYW0pOworICAgIExPRyhUZXh0SW5wdXQsICJvbklNRVNlbGVjdCBs b2NhbGUgJWxkICVzIiwgbHBhcmFtLCB3cGFyYW0gPyAic2VsZWN0IiA6ICJkZXNlbGVjdCIpOwog ICAgIHJldHVybiBmYWxzZTsKIH0KIAotYm9vbCBXZWJWaWV3OjpvbklNRVNldENvbnRleHQoV1BB UkFNLCBMUEFSQU0pCitib29sIFdlYlZpZXc6Om9uSU1FU2V0Q29udGV4dChXUEFSQU0gd3BhcmFt LCBMUEFSQU0pCiB7CisgICAgTE9HKFRleHRJbnB1dCwgIm9uSU1FU2V0Q29udGV4dCAlcyIsIHdw YXJhbSA/ICJhY3RpdmUiIDogImluYWN0aXZlIik7CiAgICAgcmV0dXJuIGZhbHNlOwogfQogCklu ZGV4OiBXZWJLaXQvd2luL1dlYlZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL1dlYlZp ZXcuaAkocmV2aXNpb24gNTI1MjYpCisrKyBXZWJLaXQvd2luL1dlYlZpZXcuaAkod29ya2luZyBj b3B5KQpAQCAtODExLDcgKzgxMSw3IEBAIHB1YmxpYzoKICAgICBib29sIG9uSU1FRW5kQ29tcG9z aXRpb24oKTsKICAgICBib29sIG9uSU1FQ2hhcihXUEFSQU0sIExQQVJBTSk7CiAgICAgYm9vbCBv bklNRU5vdGlmeShXUEFSQU0sIExQQVJBTSwgTFJFU1VMVCopOwotICAgIGJvb2wgb25JTUVSZXF1 ZXN0KFdQQVJBTSwgTFBBUkFNLCBMUkVTVUxUKik7CisgICAgTFJFU1VMVCBvbklNRVJlcXVlc3Qo V1BBUkFNLCBMUEFSQU0pOwogICAgIGJvb2wgb25JTUVTZWxlY3QoV1BBUkFNLCBMUEFSQU0pOwog ICAgIGJvb2wgb25JTUVTZXRDb250ZXh0KFdQQVJBTSwgTFBBUkFNKTsKICAgICB2b2lkIHNlbGVj dGlvbkNoYW5nZWQoKTsKQEAgLTkwNCw4ICs5MDQsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgdm9pZCBj bG9zZVdpbmRvd1RpbWVyRmlyZWQoV2ViQ29yZTo6VGltZXI8V2ViVmlldz4qKTsKICAgICB2b2lk IHByZXBhcmVDYW5kaWRhdGVXaW5kb3coV2ViQ29yZTo6RnJhbWUqLCBISU1DKTsKICAgICB2b2lk IHVwZGF0ZVNlbGVjdGlvbkZvcklNRSgpOwotICAgIGJvb2wgb25JTUVSZXF1ZXN0Q2hhclBvc2l0 aW9uKFdlYkNvcmU6OkZyYW1lKiwgSU1FQ0hBUlBPU0lUSU9OKiwgTFJFU1VMVCopOwotICAgIGJv b2wgb25JTUVSZXF1ZXN0UmVjb252ZXJ0U3RyaW5nKFdlYkNvcmU6OkZyYW1lKiwgUkVDT05WRVJU U1RSSU5HKiwgTFJFU1VMVCopOworICAgIExSRVNVTFQgb25JTUVSZXF1ZXN0Q2hhclBvc2l0aW9u KFdlYkNvcmU6OkZyYW1lKiwgSU1FQ0hBUlBPU0lUSU9OKik7CisgICAgTFJFU1VMVCBvbklNRVJl cXVlc3RSZWNvbnZlcnRTdHJpbmcoV2ViQ29yZTo6RnJhbWUqLCBSRUNPTlZFUlRTVFJJTkcqKTsK ICAgICBib29sIGRldmVsb3BlckV4dHJhc0VuYWJsZWQoKSBjb25zdDsKIAogICAgIC8vIEFsbFdl YlZpZXdTZXQgZnVuY3Rpb25zCg==