183335 2018-03-05 09:41:46 -0800 [WinCairo] Fix build errors when ENABLE_NETSCAPE_PLUGIN_API is turned off 2018-03-15 13:42:17 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 Yousuke.Kimoto webkit-unassigned achristensen commit-queue webkit-bug-importer oldest_to_newest 1403642 0 Yousuke.Kimoto 2018-03-05 09:41:46 -0800 For WinCairo WebKitLegacy, many build errors occur when ENABLE_NETSCAPE_PLUGIN_API is turned. This ticket fixes the issue. 1403696 1 335011 Yousuke.Kimoto 2018-03-05 11:42:33 -0800 Created attachment 335011 Patch 1406783 2 335011 commit-queue 2018-03-15 13:41:45 -0700 Comment on attachment 335011 Patch Clearing flags on attachment: 335011 Committed r229640: <https://trac.webkit.org/changeset/229640> 1406784 3 commit-queue 2018-03-15 13:41:46 -0700 All reviewed patches have been landed. Closing bug. 1406785 4 webkit-bug-importer 2018-03-15 13:42:17 -0700 <rdar://problem/38514436> 335011 2018-03-05 11:42:33 -0800 2018-03-15 13:41:45 -0700 Patch bug-183335-20180306044236.patch text/plain 9194 Yousuke.Kimoto U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5MTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVn YWN5L3dpbi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9DaGFuZ2VMb2cKaW5k ZXggNTgwODBlOTEzMmZmZjczODc0ZjAyYjZhZmYxNTRkNmM5N2YyYTFmYy4uMDZkOTYwYzI3ODU1 MmY3YzMyODAxMzYyNTEzZTEzNTViMzE0YzdjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdExl Z2FjeS93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI0IEBACisyMDE4LTAzLTA1ICBZb3VzdWtlIEtpbW90byAgPHlvdXN1a2Uu a2ltb3RvQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWlyb10gRml4IGJ1aWxkIGVycm9ycyB3 aGVuIEVOQUJMRV9ORVRTQ0FQRV9QTFVHSU5fQVBJIGlzIHR1cm5lZCBvZmYKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzMzNQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogUGx1Z2lucy9QbHVnaW5EYXRh YmFzZVdpbi5jcHA6CisgICAgICAgICogUGx1Z2lucy9QbHVnaW5NZXNzYWdlVGhyb3R0bGVyV2lu LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsdWdpbk1lc3NhZ2VUaHJvdHRsZXJXaW46OnByb2Nl c3NRdWV1ZWRNZXNzYWdlKToKKyAgICAgICAgKiBQbHVnaW5zL1BsdWdpblBhY2thZ2VXaW4uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UGx1Z2luUGFja2FnZTo6bG9hZCk6CisgICAgICAgICogUGx1 Z2lucy9QbHVnaW5WaWV3Lmg6CisgICAgICAgICogUGx1Z2lucy9QbHVnaW5WaWV3V2luLmNwcDoK KyAgICAgICAgKiBQbHVnaW5zL25wYXBpLmNwcDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6 Y3JlYXRlUGx1Z2luKToKKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVKYXZh QXBwbGV0V2lkZ2V0KToKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6 OldlYlZpZXdXbmRQcm9jKToKKwogMjAxOC0wMy0wMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUu dGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBSZW1vdmUgbW9ub3RvbmljYWxseUluY3JlYXNpbmdU aW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpbkRh dGFiYXNlV2luLmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2luRGF0 YWJhc2VXaW4uY3BwCmluZGV4IGI4MjNlNmQ1MWJmNmJhNjFkNTNiYTc3OTI4ZWNlNmM4ZGEzOGYy NTYuLmMzZTQ5ZjQ0MTk2NTQ2MTBlZmQ0ZGM1ZjVlYmQ5YWIwOTFjMDZlMTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2luRGF0YWJhc2VXaW4uY3BwCisr KyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2luRGF0YWJhc2VXaW4uY3Bw CkBAIC02OCw2ICs2OCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRQbHVnaW5QYXRoc0Zyb21S ZWdpc3RyeShIS0VZIHJvb3RLZXksIEhhc2hTZXQ8U3RyaW5nPiYgcGF0CiAgICAgUmVnQ2xvc2VL ZXkoa2V5KTsKIH0KIAorI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogdm9pZCBQbHVn aW5EYXRhYmFzZTo6Z2V0UGx1Z2luUGF0aHNJbkRpcmVjdG9yaWVzKEhhc2hTZXQ8U3RyaW5nPiYg cGF0aHMpIGNvbnN0CiB7CiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIGJlIGEgY2FzZSBpbnNl bnNpdGl2ZSBzZXQuCkBAIC0xMjAsNiArMTIxLDcgQEAgdm9pZCBQbHVnaW5EYXRhYmFzZTo6Z2V0 UGx1Z2luUGF0aHNJbkRpcmVjdG9yaWVzKEhhc2hTZXQ8U3RyaW5nPiYgcGF0aHMpIGNvbnN0CiAg ICAgaWYgKCFvbGRXTVBQbHVnaW5QYXRoLmlzRW1wdHkoKSAmJiAhbmV3V01QUGx1Z2luUGF0aC5p c0VtcHR5KCkpCiAgICAgICAgIHBhdGhzLnJlbW92ZShvbGRXTVBQbHVnaW5QYXRoKTsKIH0KKyNl bmRpZgogCiBzdGF0aWMgaW5saW5lIFZlY3RvcjxpbnQ+IHBhcnNlVmVyc2lvblN0cmluZyhjb25z dCBTdHJpbmcmIHZlcnNpb25TdHJpbmcpCiB7CkBAIC0zNTYsNiArMzU4LDcgQEAgc3RhdGljIGlu bGluZSB2b2lkIGFkZE1hY3JvbWVkaWFQbHVnaW5EaXJlY3RvcmllcyhWZWN0b3I8U3RyaW5nPiYg ZGlyZWN0b3JpZXMpCiAgICAgZGlyZWN0b3JpZXMuYXBwZW5kKG51bGxUZXJtaW5hdGVkV0NoYXJU b1N0cmluZyhtYWNyb21lZGlhRGlyZWN0b3J5U3RyKSk7CiB9CiAKKyNpZiBFTkFCTEUoTkVUU0NB UEVfUExVR0lOX0FQSSkKIFZlY3RvcjxTdHJpbmc+IFBsdWdpbkRhdGFiYXNlOjpkZWZhdWx0UGx1 Z2luRGlyZWN0b3JpZXMoKQogewogICAgIFZlY3RvcjxTdHJpbmc+IGRpcmVjdG9yaWVzOwpAQCAt MzgwLDUgKzM4Myw2IEBAIGJvb2wgUGx1Z2luRGF0YWJhc2U6OmlzUHJlZmVycmVkUGx1Z2luRGly ZWN0b3J5KGNvbnN0IFN0cmluZyYgZGlyZWN0b3J5KQogCiAgICAgcmV0dXJuIGZhbHNlOwogfQor I2VuZGlmCiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMv UGx1Z2luTWVzc2FnZVRocm90dGxlcldpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9Q bHVnaW5zL1BsdWdpbk1lc3NhZ2VUaHJvdHRsZXJXaW4uY3BwCmluZGV4IDE5ZTA2NzMxMDliOGNl ZTA4NWM2Y2RjNTFhZTA4YTc5ZmRmMTBmZjUuLjhiNWRmNWRhMjc3ZGM1YzI2ODg2N2FiZjk3MjIw NGQ4ZmYzZmM5NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMv UGx1Z2luTWVzc2FnZVRocm90dGxlcldpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdExlZ2FjeS93 aW4vUGx1Z2lucy9QbHVnaW5NZXNzYWdlVGhyb3R0bGVyV2luLmNwcApAQCAtMTAzLDEwICsxMDMs MTIgQEAgdm9pZCBQbHVnaW5NZXNzYWdlVGhyb3R0bGVyV2luOjpwcm9jZXNzUXVldWVkTWVzc2Fn ZSgpCiAgICAgaWYgKG1lc3NhZ2UgPT0gbV9iYWNrKQogICAgICAgICBtX2JhY2sgPSAwOwogCisj aWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgLy8gUHJvdGVjdCB0aGUgUGx1Z2lu VmlldyBmcm9tIGRlc3RydWN0aW9uIHdoaWxlIGNhbGxpbmcgaXRzIHdpbmRvdyBwcm9jLgogICAg IC8vIDxyZGFyOi8vcHJvYmxlbS82OTMwMjgwPgogICAgIFJlZlB0cjxQbHVnaW5WaWV3PiBwcm90 ZWN0KG1fcGx1Z2luVmlldyk7CiAgICAgOjpDYWxsV2luZG93UHJvYyhtX3BsdWdpblZpZXctPnBs dWdpblduZFByb2MoKSwgbWVzc2FnZS0+aFduZCwgbWVzc2FnZS0+bXNnLCBtZXNzYWdlLT53UGFy YW0sIG1lc3NhZ2UtPmxQYXJhbSk7CisjZW5kaWYKIAogICAgIGZyZWVNZXNzYWdlKG1lc3NhZ2Up OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5Q YWNrYWdlV2luLmNwcCBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2luUGFj a2FnZVdpbi5jcHAKaW5kZXggYmFlNzI3NmNiYTZiMjQwMzA4MmUwZDljNGEyNDljMDFhODVkMTU2 NS4uZjUzMmM3NDZhNjJhNTM4NGI3ODYxY2IwNzA2OTJiZDQzYzI1OTNkMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5QYWNrYWdlV2luLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpblBhY2thZ2VXaW4uY3BwCkBA IC0yNjIsMTUgKzI2MiwyMCBAQCBib29sIFBsdWdpblBhY2thZ2U6OmxvYWQoKQogCiAgICAgTlBf R2V0RW50cnlQb2ludHNGdW5jUHRyIE5QX0dldEVudHJ5UG9pbnRzID0gMDsKICAgICBOUF9Jbml0 aWFsaXplRnVuY1B0ciBOUF9Jbml0aWFsaXplID0gMDsKLSAgICBOUEVycm9yIG5wRXJyOworICAg IE5QRXJyb3IgbnBFcnIgPSBOUEVSUl9OT19FUlJPUjsKIAogICAgIE5QX0luaXRpYWxpemUgPSAo TlBfSW5pdGlhbGl6ZUZ1bmNQdHIpR2V0UHJvY0FkZHJlc3MobV9tb2R1bGUsICJOUF9Jbml0aWFs aXplIik7CiAgICAgTlBfR2V0RW50cnlQb2ludHMgPSAoTlBfR2V0RW50cnlQb2ludHNGdW5jUHRy KUdldFByb2NBZGRyZXNzKG1fbW9kdWxlLCAiTlBfR2V0RW50cnlQb2ludHMiKTsKKyNpZiBFTkFC TEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICBtX05QUF9TaHV0ZG93biA9IChOUFBfU2h1dGRv d25Qcm9jUHRyKUdldFByb2NBZGRyZXNzKG1fbW9kdWxlLCAiTlBfU2h1dGRvd24iKTsKIAogICAg IGlmICghTlBfSW5pdGlhbGl6ZSB8fCAhTlBfR2V0RW50cnlQb2ludHMgfHwgIW1fTlBQX1NodXRk b3duKQorI2Vsc2UKKyAgICBpZiAoIU5QX0luaXRpYWxpemUgfHwgIU5QX0dldEVudHJ5UG9pbnRz KQorI2VuZGlmCiAgICAgICAgIGdvdG8gYWJvcnQ7CiAKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExV R0lOX0FQSSkKICAgICBtZW1zZXQoJm1fcGx1Z2luRnVuY3MsIDAsIHNpemVvZihtX3BsdWdpbkZ1 bmNzKSk7CiAgICAgbV9wbHVnaW5GdW5jcy5zaXplID0gc2l6ZW9mKG1fcGx1Z2luRnVuY3MpOwog CkBAIC0yODYsNyArMjkxLDcgQEAgYm9vbCBQbHVnaW5QYWNrYWdlOjpsb2FkKCkKIAogICAgIGlm IChucEVyciAhPSBOUEVSUl9OT19FUlJPUikKICAgICAgICAgZ290byBhYm9ydDsKLQorI2VuZGlm CiAgICAgbV9sb2FkQ291bnQrKzsKICAgICByZXR1cm4gdHJ1ZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5WaWV3LmggYi9Tb3VyY2UvV2ViS2l0 TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcuaAppbmRleCAzODQyMmViMTFmZTcyOTYzZmY0 MzhlZjA4MmZhYTIzNzZmZTA2MDNjLi5iNGU5MWY2ZTEyYjNiYjliMmEzOWQ4YmE4ZjAyYTk0MjA0 MDViZDMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdp blZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpblZpZXcu aApAQCAtMzEyLDkgKzMxMiw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgTlBQIG1f aW5zdGFuY2U7CiAgICAgICAgIE5QUF90IG1faW5zdGFuY2VTdHJ1Y3Q7CiAgICAgICAgIE5QV2lu ZG93IG1fbnBXaW5kb3c7Ci0jZW5kaWYKIAogICAgICAgICBOUE9iamVjdCogbV9lbGVtZW50TlBP YmplY3Q7CisjZW5kaWYKIAogICAgICAgICBWZWN0b3I8Ym9vbCwgND4gbV9wb3B1cFN0YXRlU3Rh Y2s7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2lu Vmlld1dpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL1BsdWdpblZpZXdX aW4uY3BwCmluZGV4IGExZTAwMTc5Nzk1YWQ4ZDQ0ZjFkYWM3NDFkZDYzM2U4YmNmMTU0YWYuLjQ5 YjlhZDIzNzQ5Mzk4NGFmN2Q4Njg5Zjk5Yzg0YTE4ZjM1Y2JkNjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXRMZWdhY3kvd2luL1BsdWdpbnMvUGx1Z2luVmlld1dpbi5jcHAKKysrIGIvU291cmNl L1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9QbHVnaW5WaWV3V2luLmNwcApAQCAtMjUsNiArMjUs NyBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4gCiAgKi8KIAorI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5f QVBJKQogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKIAogI2luY2x1ZGUgIlBsdWdpbkRhdGFiYXNl LmgiCkBAIC05NzYsMyArOTc3LDUgQEAgZmxvYXQgUGx1Z2luVmlldzo6ZGV2aWNlU2NhbGVGYWN0 b3IoKSBjb25zdAogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdExlZ2FjeS93aW4vUGx1Z2lucy9ucGFwaS5jcHAgYi9Tb3VyY2Uv V2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL25wYXBpLmNwcAppbmRleCBmMGE5NzAwZmRhYWMzMDIw MDBiYjVlOWM0MzQ0MzdlYjJlNmMzNmU1Li44NTJiM2RjYTRjODcwNTkyNWNhMjU0YWY1ZGNlYzUz ODZmYmM2ZDJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL25w YXBpLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9QbHVnaW5zL25wYXBpLmNwcApA QCAtMjMsNiArMjMsOCBAQAogICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4gCiAgKi8KIAorI2lmIEVOQUJMRShORVRT Q0FQRV9QTFVHSU5fQVBJKQorCiAjaW5jbHVkZSAiUGx1Z2luTWFpblRocmVhZFNjaGVkdWxlci5o IgogI2luY2x1ZGUgIlBsdWdpblZpZXcuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1BhZ2UuaD4KQEAg LTE5OCwzICsyMDAsNSBAQCBOUEVycm9yIE5QTl9Qb3BVcENvbnRleHRNZW51KE5QUCBpbnN0YW5j ZSwgTlBNZW51KiBtZW51KQogICAgIFVOVVNFRF9QQVJBTShtZW51KTsKICAgICByZXR1cm4gTlBF UlJfTk9fRVJST1I7CiB9CisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdExlZ2Fj eS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dl YktpdExlZ2FjeS93aW4vV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmlu ZGV4IDQ4NDkxNGI4YzBkNmU2ZGIyMjM3N2JkYjg2MmFhZmI1YjRjZjcxNDguLjI3YmVkZmM4ZGRk OTdjZmI1YzJlMGE0YjVmMTNkY2UzYWFkNTZiYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRM ZWdhY3kvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKQEAgLTExNjksNiArMTE2OSw3IEBAIFJlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6ZSYgcGx1Z2luU2l6ZSwgSFRNCiAgICAg ICAgIH0KICAgICB9CiAKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICBGcmFt ZSogZnJhbWUgPSBjb3JlKG1fd2ViRnJhbWUpOwogICAgIFJlZlB0cjxQbHVnaW5WaWV3PiBwbHVn aW5WaWV3ID0gUGx1Z2luVmlldzo6Y3JlYXRlKGZyYW1lLCBwbHVnaW5TaXplLCAmZWxlbWVudCwg dXJsLCBwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcywgbWltZVR5cGUsIGxvYWRNYW51YWxseSk7CiAK QEAgLTExNzYsNyArMTE3Nyw3IEBAIFJlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50 OjpjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6ZSYgcGx1Z2luU2l6ZSwgSFRNCiAgICAgICAgIHJl dHVybiBwbHVnaW5WaWV3OwogCiAgICAgZGlzcGF0Y2hEaWRGYWlsVG9TdGFydFBsdWdpbihwbHVn aW5WaWV3LmdldCgpKTsKLQorI2VuZGlmCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKQEAgLTEx OTEsNiArMTE5Miw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnJlZGlyZWN0RGF0YVRv UGx1Z2luKFdpZGdldCYgcGx1Z2luV2lkZ2V0KQogCiBSZWZQdHI8V2lkZ2V0PiBXZWJGcmFtZUxv YWRlckNsaWVudDo6Y3JlYXRlSmF2YUFwcGxldFdpZGdldChjb25zdCBJbnRTaXplJiBwbHVnaW5T aXplLCBIVE1MQXBwbGV0RWxlbWVudCYgZWxlbWVudCwgY29uc3QgVVJMJiAvKmJhc2VVUkwqLywg Y29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBw YXJhbVZhbHVlcykKIHsKKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICBSZWZQ dHI8UGx1Z2luVmlldz4gcGx1Z2luVmlldyA9IFBsdWdpblZpZXc6OmNyZWF0ZShjb3JlKG1fd2Vi RnJhbWUpLCBwbHVnaW5TaXplLCAmZWxlbWVudCwgVVJMKCksIHBhcmFtTmFtZXMsIHBhcmFtVmFs dWVzLCAiYXBwbGljYXRpb24veC1qYXZhLWFwcGxldCIsIGZhbHNlKTsKIAogICAgIC8vIENoZWNr IGlmIHRoZSBwbHVnaW4gY2FuIGJlIGxvYWRlZCBzdWNjZXNzZnVsbHkKQEAgLTEyMTMsNiArMTIx NSw5IEBAIFJlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpjcmVhdGVKYXZhQXBw bGV0V2lkZ2V0KGNvbnN0IEludFNpemUmIHBsdWdpCiAgICAgcmVzb3VyY2VMb2FkRGVsZWdhdGUt PnBsdWdJbkZhaWxlZFdpdGhFcnJvcih3ZWJWaWV3LCBlcnJvci5nZXQoKSwgZ2V0V2ViRGF0YVNv dXJjZShjb3JlRnJhbWUtPmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkpKTsKIAogICAgIHJldHVy biBXVEZNb3ZlKHBsdWdpblZpZXcpOworI2Vsc2UKKyAgICByZXR1cm4gbnVsbHB0cjsKKyNlbmRp ZgogfQogCiBXZWJIaXN0b3J5KiBXZWJGcmFtZUxvYWRlckNsaWVudDo6d2ViSGlzdG9yeSgpIGNv bnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L3dpbi9XZWJWaWV3LmNwcCBiL1Nv dXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3BwCmluZGV4IGM3OTkwMzk4ZmNmMzUzMTJh ZTc2MzRiNDU5OTZjZjQwMzkxM2I3ZGQuLjM0MTZmYzY4ZjY4OThiODEzNzc0MWNjYTQ0NGM3MjAz Y2YyODlkODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvd2luL1dlYlZpZXcuY3BwCkBAIC0yNTQ5LDExICsy NTQ5LDEzIEBAIExSRVNVTFQgQ0FMTEJBQ0sgV2ViVmlldzo6V2ViVmlld1duZFByb2MoSFdORCBo V25kLCBVSU5UIG1lc3NhZ2UsIFdQQVJBTSB3UGFyYW0sCiAgICAgLy8gdGhleSBhcmUgZGVsaXZl cmVkLiBXZSByZXBvc3QgcGFpbnQgbWVzc2FnZXMgc28gdGhhdCB3ZSBldmVudHVhbGx5IGdldAog ICAgIC8vIGEgY2hhbmNlIHRvIHBhaW50IG9uY2UgdGhlIG1vZGFsIGxvb3AgaGFzIGV4aXRlZCwg YnV0IG90aGVyIG1lc3NhZ2VzCiAgICAgLy8gYXJlbid0IHNhZmUgdG8gcmVwb3N0LCBzbyB3ZSBq dXN0IGRyb3AgdGhlbS4KKyNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKICAgICBpZiAo UGx1Z2luVmlldzo6aXNDYWxsaW5nUGx1Z2luKCkpIHsKICAgICAgICAgaWYgKG1lc3NhZ2UgPT0g V01fUEFJTlQpCiAgICAgICAgICAgICBQb3N0TWVzc2FnZShoV25kLCBtZXNzYWdlLCB3UGFyYW0s IGxQYXJhbSk7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0KKyNlbmRpZgogCiAgICAgYm9vbCBo YW5kbGVkID0gdHJ1ZTsKIAo=