120383 2013-08-27 16:27:45 -0700 [Windows] Loader is not properly determining supported MIME Types 2013-08-28 10:52:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham eric.carlson webkit-bug-importer oldest_to_newest 921729 0 bfulgham 2013-08-27 16:27:45 -0700 The Windows port of WebKit does not properly identify media MIME types supported by the current WebKit infrastructure. The easiest way to see this is to uninstall the QuickTime player and then attempt to play one of the natively supported media types. WebKit does not check for internally supported media types, and rejects the content if it cannot find a plugin that provides support for the MIME type. 921730 1 bfulgham 2013-08-27 16:28:40 -0700 This bug is visible when requesting a WebView display a media type (e.g., http://test-safari.apple.com/captions/media/AVSCCsync720P_AW_122.mov). 921731 2 webkit-bug-importer 2013-08-27 16:29:07 -0700 <rdar://problem/14851052> 921732 3 bfulgham 2013-08-27 16:31:39 -0700 This patch was put together with Eric Carlson, though the refactoring to avoid the String->BSTR->String round trip was added later. 921733 4 209819 bfulgham 2013-08-27 16:31:57 -0700 Created attachment 209819 Patch 921734 5 209820 bfulgham 2013-08-27 16:33:27 -0700 Created attachment 209820 Patch 921743 6 209820 buildbot 2013-08-27 17:11:03 -0700 Comment on attachment 209820 Patch Attachment 209820 did not pass win-ews (win): Output: http://webkit-queues.appspot.com/results/1625077 921777 7 209820 darin 2013-08-27 18:15:03 -0700 Comment on attachment 209820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209820&action=review > Source/WebKit/win/WebView.cpp:2579 > + notImplemented(); > + return true; Sorry, I don’t get why this isn’t implemented. 921839 8 209820 bfulgham 2013-08-27 22:15:59 -0700 Comment on attachment 209820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209820&action=review >> Source/WebKit/win/WebView.cpp:2579 >> + return true; > > Sorry, I don’t get why this isn’t implemented. It wasn't implemented before. I started hooking it up on the client side and realized the WebView wasn't implemented either. I figured it was better to have a "not implemented" state in a single place, rather than having it not implemented in the WebFrameLoaderClient *and* not implemented in the WebView. Now at least there is only one thing to implement. 921840 9 209820 bfulgham 2013-08-27 22:16:01 -0700 Comment on attachment 209820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209820&action=review >> Source/WebKit/win/WebView.cpp:2579 >> + return true; > > Sorry, I don’t get why this isn’t implemented. It wasn't implemented before. I started hooking it up on the client side and realized the WebView wasn't implemented either. I figured it was better to have a "not implemented" state in a single place, rather than having it not implemented in the WebFrameLoaderClient *and* not implemented in the WebView. Now at least there is only one thing to implement. 922040 10 bfulgham 2013-08-28 09:18:02 -0700 (In reply to comment #6) > (From update of attachment 209820 [details]) > Attachment 209820 [details] did not pass win-ews (win): > Output: http://webkit-queues.appspot.com/results/1625077 This output seems wrong. All individual projects build, but the overall state is marked 'Failed'. I also do not see any build errors when performing a local build. 922055 11 209820 eric.carlson 2013-08-28 09:41:31 -0700 Comment on attachment 209820 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=209820&action=review >>>> Source/WebKit/win/WebView.cpp:2579 >>>> + return true; >>> >>> Sorry, I don’t get why this isn’t implemented. >> >> It wasn't implemented before. I started hooking it up on the client side and realized the WebView wasn't implemented either. I figured it was better to have a "not implemented" state in a single place, rather than having it not implemented in the WebFrameLoaderClient *and* not implemented in the WebView. Now at least there is only one thing to implement. > > It wasn't implemented before. I started hooking it up on the client side and realized the WebView wasn't implemented either. I figured it was better to have a "not implemented" state in a single place, rather than having it not implemented in the WebFrameLoaderClient *and* not implemented in the WebView. Now at least there is only one thing to implement. It might be worth filing about about implementing all of the missing parts of WebView. > Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp:926 > +bool WebFrameLoaderClient::canShowMIMEType(const String& MIMEType) const Although we are inconsistent about whether a "MIME type" variable should be "MIMEType" or "mimeType", the later is more than 8x more common so I would suggest using that. If you prefer the former, you should at least make all uses in this patch consistent. 922093 12 bfulgham 2013-08-28 10:28:09 -0700 Committed r154759: <http://trac.webkit.org/changeset/154759> 922100 13 bfulgham 2013-08-28 10:52:34 -0700 (In reply to comment #11) > (From update of attachment 209820 [details]) > It might be worth filing about about implementing all of the missing parts of WebView. Done. Filed as https://bugs.webkit.org/show_bug.cgi?id=120426. 209819 2013-08-27 16:31:57 -0700 2013-08-27 16:33:26 -0700 Patch bug-120383-20130827163221.patch text/plain 5604 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDcxNCkKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA4LTI3 ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dz XSBMb2FkZXIgaXMgbm90IHByb3Blcmx5IGRldGVybWluaW5nIHN1cHBvcnRlZCBNSU1FIHR5cGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjAzODMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkZyYW1lTG9h ZGVyQ2xpZW50OjpjYW5TaG93TUlNRVR5cGUpOiBNb2RpZnkgdG8gYXNrIFdlYlZpZXcgaWYgaXQg Y2FuCisgICAgICAgIGRpc3BsYXkgdGhlIG1lZGlhIHR5cGUuIFVzZSBuZXcgaGVscGVyIGZ1bmN0 aW9uIHRvIGF2b2lkIGNvbnZlcnRpbmcgYSBTdHJpbmcKKyAgICAgICAgdG8gQlNUUiwgb25seSB0 byBpbW1lZGlhdGx5IGJlIGNvbnZlcnRlZCBmcm9tIEJTVFIgYmFjayB0byBTdHJpbmcuCisgICAg ICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6Y2FuU2hvd01JTUVUeXBlQXNIVE1MKTogRGl0dG8u CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpjYW5TaG93TUlNRVR5 cGUpOiBNb3ZlIGxvZ2ljIHRvIGEgbmV3IChzaW1pbGFybHkgbmFtZWQpIGhlbHBlciBmdW5jdGlv bi4KKyAgICAgICAgKFdlYlZpZXc6OmNhblNob3dNSU1FVHlwZUFzSFRNTCk6IERpdHRvLgorICAg ICAgICAqIFdlYlZpZXcuaDogQWRkIGRlY2xhcmF0aW9uIGZvciB0d28gbmV3IGhlbHBlciBmdW5j dGlvbnMuCisKIDIwMTMtMDgtMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgQW5vdGhlciBXaW5kb3dzIGJ1aWxkIGZpeCBhZnRlciByMTU0NjU4LgpJbmRleDog U291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDE1NDY5MikKKysrIFNvdXJjZS9XZWJLaXQvd2lu L1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTEsNiArMTExLDcgQEAKICNpbmNsdWRl IDxXZWJDb3JlL0xvZ2dpbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0cnku aD4KICNpbmNsdWRlIDxXZWJDb3JlL01lbW9yeUNhY2hlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9O b3RJbXBsZW1lbnRlZC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgogI2luY2x1ZGUgPFdl YkNvcmUvUGFnZUNhY2hlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlR3JvdXAuaD4KQEAgLTI1 MzAsMzggKzI1MzEsNTEgQEAgVUxPTkcgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6UmVsZWFz ZQogCiAvLyBJV2ViVmlldyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi1IUkVTVUxUIFNURE1FVEhPRENBTExUWVBF IFdlYlZpZXc6OmNhblNob3dNSU1FVHlwZSggCi0gICAgLyogW2luXSAqLyBCU1RSIG1pbWVUeXBl LAotICAgIC8qIFtyZXR2YWxdW291dF0gKi8gQk9PTCogY2FuU2hvdykKK2Jvb2wgV2ViVmlldzo6 Y2FuU2hvd01JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpCiB7Ci0gICAgU3RyaW5nIG1p bWVUeXBlU3RyID0gdG9TdHJpbmcobWltZVR5cGUpOwotCi0gICAgaWYgKCFjYW5TaG93KQotICAg ICAgICByZXR1cm4gRV9QT0lOVEVSOwotCiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNvcmUobV9t YWluRnJhbWUpOwogICAgIGJvb2wgYWxsb3dQbHVnaW5zID0gY29yZUZyYW1lICYmIGNvcmVGcmFt ZS0+bG9hZGVyKCkuc3ViZnJhbWVMb2FkZXIoKS0+YWxsb3dQbHVnaW5zKE5vdEFib3V0VG9JbnN0 YW50aWF0ZVBsdWdpbik7CiAKLSAgICAqY2FuU2hvdyA9IE1JTUVUeXBlUmVnaXN0cnk6OmlzU3Vw cG9ydGVkSW1hZ2VNSU1FVHlwZShtaW1lVHlwZVN0cikKLSAgICAgICAgfHwgTUlNRVR5cGVSZWdp c3RyeTo6aXNTdXBwb3J0ZWROb25JbWFnZU1JTUVUeXBlKG1pbWVUeXBlU3RyKTsKKyAgICBib29s IGNhblNob3cgPSBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUobWlt ZVR5cGUpCisgICAgICAgIHx8IE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkTm9uSW1hZ2VN SU1FVHlwZShtaW1lVHlwZSkKKyAgICAgICAgfHwgTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0 ZWRNZWRpYU1JTUVUeXBlKG1pbWVUeXBlKTsKKwogCi0gICAgaWYgKCEqY2FuU2hvdyAmJiBtX3Bh Z2UgJiYgbV9wYWdlLT5wbHVnaW5EYXRhKCkpIHsKLSAgICAgICAgKmNhblNob3cgPSAobV9wYWdl LT5wbHVnaW5EYXRhKCktPnN1cHBvcnRzTWltZVR5cGUobWltZVR5cGVTdHIsIFBsdWdpbkRhdGE6 OkFsbFBsdWdpbnMpICYmIGFsbG93UGx1Z2lucykKLSAgICAgICAgICAgIHx8IG1fcGFnZS0+cGx1 Z2luRGF0YSgpLT5zdXBwb3J0c01pbWVUeXBlKG1pbWVUeXBlU3RyLCBQbHVnaW5EYXRhOjpPbmx5 QXBwbGljYXRpb25QbHVnaW5zKTsKKyAgICBpZiAoIWNhblNob3cgJiYgbV9wYWdlICYmIG1fcGFn ZS0+cGx1Z2luRGF0YSgpKSB7CisgICAgICAgIGNhblNob3cgPSAobV9wYWdlLT5wbHVnaW5EYXRh KCktPnN1cHBvcnRzTWltZVR5cGUobWltZVR5cGUsIFBsdWdpbkRhdGE6OkFsbFBsdWdpbnMpICYm IGFsbG93UGx1Z2lucykKKyAgICAgICAgICAgIHx8IG1fcGFnZS0+cGx1Z2luRGF0YSgpLT5zdXBw b3J0c01pbWVUeXBlKG1pbWVUeXBlLCBQbHVnaW5EYXRhOjpPbmx5QXBwbGljYXRpb25QbHVnaW5z KTsKICAgICB9CiAKLSAgICBpZiAoISpjYW5TaG93KQotICAgICAgICAqY2FuU2hvdyA9IHNob3Vs ZFVzZUVtYmVkZGVkVmlldyhtaW1lVHlwZVN0cik7CisgICAgaWYgKCFjYW5TaG93KQorICAgICAg ICBjYW5TaG93ID0gc2hvdWxkVXNlRW1iZWRkZWRWaWV3KG1pbWVUeXBlKTsKKworICAgIHJldHVy biBjYW5TaG93OworfQorCitIUkVTVUxUIFdlYlZpZXc6OmNhblNob3dNSU1FVHlwZSgvKiBbaW5d ICovIEJTVFIgbWltZVR5cGUsIC8qIFtyZXR2YWxdW291dF0gKi8gQk9PTCogY2FuU2hvdykKK3sK KyAgICBpZiAoIWNhblNob3cpCisgICAgICAgIHJldHVybiBFX1BPSU5URVI7CisKKyAgICAqY2Fu U2hvdyA9IGNhblNob3dNSU1FVHlwZSh0b1N0cmluZyhtaW1lVHlwZSkpOwogCiAgICAgcmV0dXJu IFNfT0s7CiB9CiAKLUhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6Y2FuU2hvd01J TUVUeXBlQXNIVE1MKCAKLSAgICAvKiBbaW5dICovIEJTVFIgLyptaW1lVHlwZSovLAotICAgIC8q IFtyZXR2YWxdW291dF0gKi8gQk9PTCogY2FuU2hvdykKK2Jvb2wgV2ViVmlldzo6Y2FuU2hvd01J TUVUeXBlQXNIVE1MKGNvbnN0IFN0cmluZyYgLyptaW1lVHlwZSovKQogewogICAgIC8vIEZJWE1F Ci0gICAgKmNhblNob3cgPSBUUlVFOworICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgcmV0dXJu IHRydWU7Cit9CisKK0hSRVNVTFQgV2ViVmlldzo6Y2FuU2hvd01JTUVUeXBlQXNIVE1MKC8qIFtp bl0gKi8gQlNUUiBtaW1lVHlwZSwgLyogW3JldHZhbF1bb3V0XSAqLyBCT09MKiBjYW5TaG93KQor eworICAgIGlmICghY2FuU2hvdykKKyAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsKKworICAgICpj YW5TaG93ID0gY2FuU2hvd01JTUVUeXBlQXNIVE1MKHRvU3RyaW5nKG1pbWVUeXBlKSk7CisKICAg ICByZXR1cm4gU19PSzsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL1dlYlZpZXcuaAkocmV2aXNpb24gMTU0Njky KQorKysgU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC05NzUs NiArOTc1LDkgQEAgcHVibGljOgogICAgIFdlYkNvcmU6OkVsZW1lbnQqIGZ1bGxTY3JlZW5FbGVt ZW50KCkgY29uc3QgeyByZXR1cm4gbV9mdWxsU2NyZWVuRWxlbWVudC5nZXQoKTsgfQogI2VuZGlm CiAKKyAgICBib29sIGNhblNob3dNSU1FVHlwZShjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKKyAg ICBib29sIGNhblNob3dNSU1FVHlwZUFzSFRNTChjb25zdCBTdHJpbmcmIG1pbWVUeXBlKTsKKwog ICAgIC8vIFVzZWQgYnkgVGV4dElucHV0Q29udHJvbGxlciBpbiBEdW1wUmVuZGVyVHJlZQogCiAg ICAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBzZXRDb21wb3NpdGlvbkZvclRlc3RpbmcoCklu ZGV4OiBTb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuY3BwCShyZXZpc2lvbiAxNTQ2OTIpCisrKyBTb3VyY2UvV2ViS2l0 L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTkyMywxNiArOTIzLDE0IEBAIGJvb2wgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNhbkhh bmRsZVJlcXUKICAgICByZXR1cm4gV2ViVmlldzo6Y2FuSGFuZGxlUmVxdWVzdChyZXF1ZXN0KTsK IH0KIAotYm9vbCBXZWJGcmFtZUxvYWRlckNsaWVudDo6Y2FuU2hvd01JTUVUeXBlKGNvbnN0IFN0 cmluZyYgLypNSU1FVHlwZSovKSBjb25zdAorYm9vbCBXZWJGcmFtZUxvYWRlckNsaWVudDo6Y2Fu U2hvd01JTUVUeXBlKGNvbnN0IFN0cmluZyYgTUlNRVR5cGUpIGNvbnN0CiB7Ci0gICAgbm90SW1w bGVtZW50ZWQoKTsKLSAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gbV93ZWJGcmFtZS0+d2Vi VmlldygpLT5jYW5TaG93TUlNRVR5cGUoTUlNRVR5cGUpOwogfQogCi1ib29sIFdlYkZyYW1lTG9h ZGVyQ2xpZW50OjpjYW5TaG93TUlNRVR5cGVBc0hUTUwoY29uc3QgU3RyaW5nJiAvKk1JTUVUeXBl Ki8pIGNvbnN0Citib29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjYW5TaG93TUlNRVR5cGVBc0hU TUwoY29uc3QgU3RyaW5nJiBNSU1FVHlwZSkgY29uc3QKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgp OwotICAgIHJldHVybiB0cnVlOworICAgIHJldHVybiBtX3dlYkZyYW1lLT53ZWJWaWV3KCktPmNh blNob3dNSU1FVHlwZUFzSFRNTChNSU1FVHlwZSk7CiB9CiAKIGJvb2wgV2ViRnJhbWVMb2FkZXJD bGllbnQ6OnJlcHJlc2VudGF0aW9uRXhpc3RzRm9yVVJMU2NoZW1lKGNvbnN0IFN0cmluZyYgLypV UkxTY2hlbWUqLykgY29uc3QK 209820 2013-08-27 16:33:27 -0700 2013-08-28 09:41:31 -0700 Patch bug-120383-20130827163350.patch text/plain 5633 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDcxNCkKKysrIFNvdXJjZS9XZWJLaXQv d2luL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEzLTA4LTI3 ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXaW5kb3dz XSBMb2FkZXIgaXMgbm90IHByb3Blcmx5IGRldGVybWluaW5nIHN1cHBvcnRlZCBNSU1FIHR5cGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjAzODMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKFdlYkZyYW1lTG9h ZGVyQ2xpZW50OjpjYW5TaG93TUlNRVR5cGUpOiBNb2RpZnkgdG8gYXNrIFdlYlZpZXcgaWYgaXQg Y2FuCisgICAgICAgIGRpc3BsYXkgdGhlIG1lZGlhIHR5cGUuIFVzZSBuZXcgaGVscGVyIGZ1bmN0 aW9uIHRvIGF2b2lkIGNvbnZlcnRpbmcgYSBTdHJpbmcKKyAgICAgICAgdG8gQlNUUiwgb25seSB0 byBpbW1lZGlhdGx5IGJlIGNvbnZlcnRlZCBmcm9tIEJTVFIgYmFjayB0byBTdHJpbmcuCisgICAg ICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6Y2FuU2hvd01JTUVUeXBlQXNIVE1MKTogRGl0dG8u CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpjYW5TaG93TUlNRVR5 cGUpOiBNb3ZlIGxvZ2ljIHRvIGEgbmV3IChzaW1pbGFybHkgbmFtZWQpIGhlbHBlciBmdW5jdGlv bi4KKyAgICAgICAgKFdlYlZpZXc6OmNhblNob3dNSU1FVHlwZUFzSFRNTCk6IERpdHRvLgorICAg ICAgICAqIFdlYlZpZXcuaDogQWRkIGRlY2xhcmF0aW9uIGZvciB0d28gbmV3IGhlbHBlciBmdW5j dGlvbnMuCisKIDIwMTMtMDgtMjYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgQW5vdGhlciBXaW5kb3dzIGJ1aWxkIGZpeCBhZnRlciByMTU0NjU4LgpJbmRleDog U291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDE1NDY5MikKKysrIFNvdXJjZS9XZWJLaXQvd2lu L1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTEsNiArMTExLDcgQEAKICNpbmNsdWRl IDxXZWJDb3JlL0xvZ2dpbmcuaD4KICNpbmNsdWRlIDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0cnku aD4KICNpbmNsdWRlIDxXZWJDb3JlL01lbW9yeUNhY2hlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9O b3RJbXBsZW1lbnRlZC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGFnZS5oPgogI2luY2x1ZGUgPFdl YkNvcmUvUGFnZUNhY2hlLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlR3JvdXAuaD4KQEAgLTI1 MzAsMzkgKzI1MzEsNTIgQEAgVUxPTkcgU1RETUVUSE9EQ0FMTFRZUEUgV2ViVmlldzo6UmVsZWFz ZQogCiAvLyBJV2ViVmlldyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCi1IUkVTVUxUIFNURE1FVEhPRENBTExUWVBF IFdlYlZpZXc6OmNhblNob3dNSU1FVHlwZSggCi0gICAgLyogW2luXSAqLyBCU1RSIG1pbWVUeXBl LAotICAgIC8qIFtyZXR2YWxdW291dF0gKi8gQk9PTCogY2FuU2hvdykKK0hSRVNVTFQgV2ViVmll dzo6Y2FuU2hvd01JTUVUeXBlKC8qIFtpbl0gKi8gQlNUUiBtaW1lVHlwZSwgLyogW3JldHZhbF1b b3V0XSAqLyBCT09MKiBjYW5TaG93KQogewotICAgIFN0cmluZyBtaW1lVHlwZVN0ciA9IHRvU3Ry aW5nKG1pbWVUeXBlKTsKLQogICAgIGlmICghY2FuU2hvdykKICAgICAgICAgcmV0dXJuIEVfUE9J TlRFUjsKIAorICAgICpjYW5TaG93ID0gY2FuU2hvd01JTUVUeXBlKHRvU3RyaW5nKG1pbWVUeXBl KSk7CisKKyAgICByZXR1cm4gU19PSzsKK30KKworYm9vbCBXZWJWaWV3OjpjYW5TaG93TUlNRVR5 cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK3sKICAgICBGcmFtZSogY29yZUZyYW1lID0gY29y ZShtX21haW5GcmFtZSk7CiAgICAgYm9vbCBhbGxvd1BsdWdpbnMgPSBjb3JlRnJhbWUgJiYgY29y ZUZyYW1lLT5sb2FkZXIoKS5zdWJmcmFtZUxvYWRlcigpLT5hbGxvd1BsdWdpbnMoTm90QWJvdXRU b0luc3RhbnRpYXRlUGx1Z2luKTsKIAotICAgICpjYW5TaG93ID0gTUlNRVR5cGVSZWdpc3RyeTo6 aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKG1pbWVUeXBlU3RyKQotICAgICAgICB8fCBNSU1FVHlw ZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZE5vbkltYWdlTUlNRVR5cGUobWltZVR5cGVTdHIpOworICAg IGJvb2wgY2FuU2hvdyA9IE1JTUVUeXBlUmVnaXN0cnk6OmlzU3VwcG9ydGVkSW1hZ2VNSU1FVHlw ZShtaW1lVHlwZSkKKyAgICAgICAgfHwgTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWROb25J bWFnZU1JTUVUeXBlKG1pbWVUeXBlKQorICAgICAgICB8fCBNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1 cHBvcnRlZE1lZGlhTUlNRVR5cGUobWltZVR5cGUpOworCiAKLSAgICBpZiAoISpjYW5TaG93ICYm IG1fcGFnZSAmJiBtX3BhZ2UtPnBsdWdpbkRhdGEoKSkgewotICAgICAgICAqY2FuU2hvdyA9ICht X3BhZ2UtPnBsdWdpbkRhdGEoKS0+c3VwcG9ydHNNaW1lVHlwZShtaW1lVHlwZVN0ciwgUGx1Z2lu RGF0YTo6QWxsUGx1Z2lucykgJiYgYWxsb3dQbHVnaW5zKQotICAgICAgICAgICAgfHwgbV9wYWdl LT5wbHVnaW5EYXRhKCktPnN1cHBvcnRzTWltZVR5cGUobWltZVR5cGVTdHIsIFBsdWdpbkRhdGE6 Ok9ubHlBcHBsaWNhdGlvblBsdWdpbnMpOworICAgIGlmICghY2FuU2hvdyAmJiBtX3BhZ2UgJiYg bV9wYWdlLT5wbHVnaW5EYXRhKCkpIHsKKyAgICAgICAgY2FuU2hvdyA9IChtX3BhZ2UtPnBsdWdp bkRhdGEoKS0+c3VwcG9ydHNNaW1lVHlwZShtaW1lVHlwZSwgUGx1Z2luRGF0YTo6QWxsUGx1Z2lu cykgJiYgYWxsb3dQbHVnaW5zKQorICAgICAgICAgICAgfHwgbV9wYWdlLT5wbHVnaW5EYXRhKCkt PnN1cHBvcnRzTWltZVR5cGUobWltZVR5cGUsIFBsdWdpbkRhdGE6Ok9ubHlBcHBsaWNhdGlvblBs dWdpbnMpOwogICAgIH0KIAotICAgIGlmICghKmNhblNob3cpCi0gICAgICAgICpjYW5TaG93ID0g c2hvdWxkVXNlRW1iZWRkZWRWaWV3KG1pbWVUeXBlU3RyKTsKKyAgICBpZiAoIWNhblNob3cpCisg ICAgICAgIGNhblNob3cgPSBzaG91bGRVc2VFbWJlZGRlZFZpZXcobWltZVR5cGUpOworCisgICAg cmV0dXJuIGNhblNob3c7Cit9CisKK0hSRVNVTFQgV2ViVmlldzo6Y2FuU2hvd01JTUVUeXBlQXNI VE1MKC8qIFtpbl0gKi8gQlNUUiBtaW1lVHlwZSwgLyogW3JldHZhbF1bb3V0XSAqLyBCT09MKiBj YW5TaG93KQoreworICAgIGlmICghY2FuU2hvdykKKyAgICAgICAgcmV0dXJuIEVfUE9JTlRFUjsK KworICAgICpjYW5TaG93ID0gY2FuU2hvd01JTUVUeXBlQXNIVE1MKHRvU3RyaW5nKG1pbWVUeXBl KSk7CiAKICAgICByZXR1cm4gU19PSzsKIH0KIAotSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBX ZWJWaWV3OjpjYW5TaG93TUlNRVR5cGVBc0hUTUwoIAotICAgIC8qIFtpbl0gKi8gQlNUUiAvKm1p bWVUeXBlKi8sCi0gICAgLyogW3JldHZhbF1bb3V0XSAqLyBCT09MKiBjYW5TaG93KQorYm9vbCBX ZWJWaWV3OjpjYW5TaG93TUlNRVR5cGVBc0hUTUwoY29uc3QgU3RyaW5nJiAvKm1pbWVUeXBlKi8p CiB7CiAgICAgLy8gRklYTUUKLSAgICAqY2FuU2hvdyA9IFRSVUU7Ci0gICAgcmV0dXJuIFNfT0s7 CisgICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogSFJFU1VMVCBT VERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpNSU1FVHlwZXNTaG93bkFzSFRNTCggCkluZGV4OiBT b3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC93 aW4vV2ViVmlldy5oCShyZXZpc2lvbiAxNTQ2OTIpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJW aWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTk3NSw2ICs5NzUsOSBAQCBwdWJsaWM6CiAgICAgV2Vi Q29yZTo6RWxlbWVudCogZnVsbFNjcmVlbkVsZW1lbnQoKSBjb25zdCB7IHJldHVybiBtX2Z1bGxT Y3JlZW5FbGVtZW50LmdldCgpOyB9CiAjZW5kaWYKIAorICAgIGJvb2wgY2FuU2hvd01JTUVUeXBl KGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOworICAgIGJvb2wgY2FuU2hvd01JTUVUeXBlQXNIVE1M KGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOworCiAgICAgLy8gVXNlZCBieSBUZXh0SW5wdXRDb250 cm9sbGVyIGluIER1bXBSZW5kZXJUcmVlCiAKICAgICBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBF IHNldENvbXBvc2l0aW9uRm9yVGVzdGluZygKSW5kZXg6IFNvdXJjZS9XZWJLaXQvd2luL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlz aW9uIDE1NDY5MikKKysrIFNvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1l TG9hZGVyQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTIzLDE2ICs5MjMsMTQgQEAgYm9v bCBXZWJGcmFtZUxvYWRlckNsaWVudDo6Y2FuSGFuZGxlUmVxdQogICAgIHJldHVybiBXZWJWaWV3 OjpjYW5IYW5kbGVSZXF1ZXN0KHJlcXVlc3QpOwogfQogCi1ib29sIFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpjYW5TaG93TUlNRVR5cGUoY29uc3QgU3RyaW5nJiAvKk1JTUVUeXBlKi8pIGNvbnN0Citi b29sIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjYW5TaG93TUlNRVR5cGUoY29uc3QgU3RyaW5nJiBN SU1FVHlwZSkgY29uc3QKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotICAgIHJldHVybiB0cnVl OworICAgIHJldHVybiBtX3dlYkZyYW1lLT53ZWJWaWV3KCktPmNhblNob3dNSU1FVHlwZShNSU1F VHlwZSk7CiB9CiAKLWJvb2wgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmNhblNob3dNSU1FVHlwZUFz SFRNTChjb25zdCBTdHJpbmcmIC8qTUlNRVR5cGUqLykgY29uc3QKK2Jvb2wgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6OmNhblNob3dNSU1FVHlwZUFzSFRNTChjb25zdCBTdHJpbmcmIE1JTUVUeXBlKSBj b25zdAogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIHRydWU7CisgICAgcmV0 dXJuIG1fd2ViRnJhbWUtPndlYlZpZXcoKS0+Y2FuU2hvd01JTUVUeXBlQXNIVE1MKE1JTUVUeXBl KTsKIH0KIAogYm9vbCBXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVwcmVzZW50YXRpb25FeGlzdHNG b3JVUkxTY2hlbWUoY29uc3QgU3RyaW5nJiAvKlVSTFNjaGVtZSovKSBjb25zdAo=