220407 2021-01-07 04:37:47 -0800 [GStreamer] Do not use the registry scanner singleton from the UI process 2021-01-11 21:04:40 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 209332 1 cgarcia webkit-unassigned bugs-noreply calvaris fujii vjaquez webkit-bug-importer oldest_to_newest 1717924 0 cgarcia 2021-01-07 04:37:47 -0800 The registry scanner is used from the UI process only to initialize the MIME type registry, so it's called once and the results are cached forever. Using the singleton keeps the instance alive forever, so we can just create a temporary registry to get the supported types. 1717925 1 417173 cgarcia 2021-01-07 04:44:45 -0800 Created attachment 417173 Patch 1718281 2 417173 vjaquez 2021-01-08 06:15:00 -0800 Comment on attachment 417173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417173&action=review > Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h:44 > + ~GStreamerRegistryScanner() = default; I wonder if it 's worth to have a if (!isInWebProcess()) gst_deinit() In the destructor 1718626 3 cgarcia 2021-01-11 00:20:07 -0800 (In reply to Víctor M. Jáquez L. from comment #2) > Comment on attachment 417173 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=417173&action=review > > > Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.h:44 > > + ~GStreamerRegistryScanner() = default; > > I wonder if it 's worth to have a > > if (!isInWebProcess()) > gst_deinit() > > In the destructor No, init and deinit are not balanced. It's ok to call init even if the app already called it, because it does nothing, but not the other way around. 1718630 4 cgarcia 2021-01-11 00:35:50 -0800 Committed r271353: <https://trac.webkit.org/changeset/271353> 1718631 5 webkit-bug-importer 2021-01-11 00:36:13 -0800 <rdar://problem/72988084> 1718859 6 fujii 2021-01-11 16:12:05 -0800 Committed r271385: <https://trac.webkit.org/changeset/271385> 1718895 7 417173 fujii 2021-01-11 21:04:40 -0800 Comment on attachment 417173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=417173&action=review > Source/WebCore/ChangeLog:11 > + * platform/glib/RuntimeApplicationChecksGLib.cpp: Added. I'd like to remove this file. Bug 220529 – Reimplement WebCore::isInWebProcess() family as cross-platform by using AuxiliaryProcessInitializationParameters.processType 417173 2021-01-07 04:44:45 -0800 2021-01-08 07:38:33 -0800 Patch wcore-gst-registry-scanner.diff text/plain 13438 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxNTI2YmM1MzkyMTcuLjMzZTJiZjNiYjA1MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMwIEBACisyMDIxLTAxLTA3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4gYW5kIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHU3RyZWFtZXJdIERvIG5vdCB1c2UgdGhlIHJlZ2lzdHJ5IHNjYW5uZXIgc2lu Z2xldG9uIGZyb20gdGhlIFVJIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMDQwNworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg6 CisgICAgICAgIChXZWJDb3JlOjppc0luTmV0d29ya1Byb2Nlc3MpOiBTaW1wbGlmeSBpZmRlZnMg YSBiaXQgYW5kIGFsbG93IGZvciBnbGliIGltcGxlbWVudGF0aW9uIGluIGEgc2VwYXJhdGUgZmls ZS4KKyAgICAgICAgKiBwbGF0Zm9ybS9Tb3VyY2VzR0xpYi50eHQ6CisgICAgICAgICogcGxhdGZv cm0vZ2xpYi9SdW50aW1lQXBwbGljYXRpb25DaGVja3NHTGliLmNwcDogQWRkZWQuCisgICAgICAg IChXZWJDb3JlOjppc0luV2ViUHJvY2Vzcyk6IEltcGxlbWVudGF0aW9uIGJhc2VkIG9uIHByb2dy YW0gZmlsZW5hbWUuCisgICAgICAgIChXZWJDb3JlOjppc0luTmV0d29ya1Byb2Nlc3MpOiBEaXR0 by4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyUmVnaXN0 cnlTY2FubmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5l cjo6Z2V0U3VwcG9ydGVkRGVjb2RpbmdUeXBlcyk6IFN0YXRpYyBmdW5jdGlvbiB0byBnZXQgdGhl IHN1cHBvcnRlZCBNSU1FIHR5cGVzCisgICAgICAgIGZvciBkZWNvZGluZy4gSXQgdXNlcyB0aGUg c2luZ2xldG9uIGlmIGNhbGxlZCBmcm9tIHRoZSB3ZWIgcHJvY2VzcyBvciBjcmVhdGVzIGEgbmV3 IGluc3RhbmNlIG90aGVyd2lzZS4KKyAgICAgICAgKFdlYkNvcmU6OkdTdHJlYW1lclJlZ2lzdHJ5 U2Nhbm5lcjo6R1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyKTogSW5pdGlhbGl6ZSBnc3Qgd2hlbiBu b3QgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9HU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Z2V0U3VwcG9ydGVkVHlwZXMp OiBVc2UgR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyOjpnZXRTdXBwb3J0ZWREZWNvZGluZ1R5cGVz KCkuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9HU3RyZWFtZXJS ZWdpc3RyeVNjYW5uZXJNU0UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R1N0cmVhbWVyUmVnaXN0 cnlTY2FubmVyTVNFOjpnZXRTdXBwb3J0ZWREZWNvZGluZ1R5cGVzKTogU3RhdGljIGZ1bmN0aW9u IHRvIGdldCB0aGUgc3VwcG9ydGVkIE1JTUUKKyAgICAgICAgdHlwZXMgZm9yIGRlY29kaW5nLiBJ dCB1c2VzIHRoZSBzaW5nbGV0b24gaWYgY2FsbGVkIGZyb20gdGhlIHdlYiBwcm9jZXNzIG9yIGNy ZWF0ZXMgYSBuZXcgaW5zdGFuY2Ugb3RoZXJ3aXNlLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9tc2UvR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyTVNFLmg6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXJNU0UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyTVNFOjpnZXRTdXBwb3J0ZWRUeXBlcyk6IFVzZSBHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJN U0U6OmdldFN1cHBvcnRlZERlY29kaW5nVHlwZXMoKS4KKwogMjAyMS0wMS0wNyAgQ2FybG9zIEdh cmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgT25seSB1cGRhdGUg dGhlIHJlc291cmNlcyB3aGVuIHJlbmRlcmluZyBTVkcgc2VsZWN0ZWQgdGV4dApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAppbmRleCA3 YWZiYTZlYzUwODguLmM5NDI3NmMzMDEzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgKQEAgLTM1LDE3ICszNSwxOSBAQCBXRUJD T1JFX0VYUE9SVCBpbnQgcHJlc2VudGluZ0FwcGxpY2F0aW9uUElEKCk7CiAjaWYgUExBVEZPUk0o V0lOKQogaW5saW5lIGJvb2wgaXNJbldlYlByb2Nlc3MoKSB7IHJldHVybiBmYWxzZTsgfQogaW5s aW5lIGJvb2wgaXNJbkdQVVByb2Nlc3MoKSB7IHJldHVybiBmYWxzZTsgfQotI2VsaWYgIVBMQVRG T1JNKENPQ09BKQorI2VsaWYgIVBMQVRGT1JNKENPQ09BKSAmJiAhVVNFKEdMSUIpCiBpbmxpbmUg Ym9vbCBpc0luV2ViUHJvY2VzcygpIHsgcmV0dXJuIHRydWU7IH0KIGlubGluZSBib29sIGlzSW5H UFVQcm9jZXNzKCkgeyByZXR1cm4gZmFsc2U7IH0KK2lubGluZSBib29sIGlzSW5OZXR3b3JrUHJv Y2VzcygpIHsgcmV0dXJuIGZhbHNlOyB9CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKENPQ09BKQot CisjaWYgUExBVEZPUk0oQ09DT0EpIHx8IFVTRShHTElCKQogYm9vbCBpc0luV2ViUHJvY2Vzcygp OwogYm9vbCBpc0luR1BVUHJvY2VzcygpOwogYm9vbCBpc0luTmV0d29ya1Byb2Nlc3MoKTsKKyNl bmRpZgogCisjaWYgUExBVEZPUk0oQ09DT0EpCiBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEFwcGxp Y2F0aW9uQnVuZGxlSWRlbnRpZmllcihjb25zdCBTdHJpbmcmKTsKIFdFQkNPUkVfRVhQT1JUIHZv aWQgc2V0QXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyT3ZlcnJpZGUoY29uc3QgU3RyaW5nJik7 CiBXRUJDT1JFX0VYUE9SVCBTdHJpbmcgYXBwbGljYXRpb25CdW5kbGVJZGVudGlmaWVyKCk7CkBA IC0xMjIsMTAgKzEyNCw2IEBAIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNDcnVuY2h5cm9sbCgpOwog CiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TX0ZBTUlMWSkKIAotI2Vsc2UKLQotaW5saW5lIGJvb2wg aXNJbk5ldHdvcmtQcm9jZXNzKCkgeyByZXR1cm4gZmFsc2U7IH0KLQogI2VuZGlmIC8vIFBMQVRG T1JNKENPQ09BKQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Tb3VyY2VzR0xpYi50eHQgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9Tb3VyY2VzR0xpYi50eHQKaW5kZXggZGYyNzNlNThhZGZhLi4wMmYwYjhiOTRlNDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1NvdXJjZXNHTGliLnR4dAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9Tb3VyY2VzR0xpYi50eHQKQEAgLTI3LDYgKzI3LDcgQEAgcGxh dGZvcm0vZ2xpYi9GaWxlTW9uaXRvckdMaWIuY3BwCiBwbGF0Zm9ybS9nbGliL0tleWVkRGVjb2Rl ckdsaWIuY3BwCiBwbGF0Zm9ybS9nbGliL0tleWVkRW5jb2RlckdsaWIuY3BwCiBwbGF0Zm9ybS9n bGliL0xvd1Bvd2VyTW9kZU5vdGlmaWVyR0xpYi5jcHAKK3BsYXRmb3JtL2dsaWIvUnVudGltZUFw cGxpY2F0aW9uQ2hlY2tzR0xpYi5jcHAKIHBsYXRmb3JtL2dsaWIvU2hhcmVkQnVmZmVyR2xpYi5j cHAKIHBsYXRmb3JtL2dsaWIvVXNlckFnZW50R0xpYi5jcHAKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ2xpYi9SdW50aW1lQXBwbGljYXRpb25DaGVja3NHTGliLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dsaWIvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzR0xp Yi5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4wNWFmODViOTk1 MjQKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGliL1J1bnRp bWVBcHBsaWNhdGlvbkNoZWNrc0dMaWIuY3BwCkBAIC0wLDAgKzEsNjIgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMjEgSWdhbGlhIFMuTC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqCisgKiAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiAgUmVk aXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyAqICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3Ro ZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElT IFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIEFORCBJVFMgQ09OVFJJQlVUT1JTICJBUyBJ UyIgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorICogV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRQorICogRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBM SUFCTEUgRk9SIEFOWQorICogRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwg RVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMKKyAqIChJTkNMVURJTkcsIEJVVCBO T1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNF UzsKKyAqIExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJV UFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORAorICogT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFks IFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNM VURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0Yg VEhFIFVTRSBPRgorICogVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NT SUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5j bHVkZSAiUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgiCisKKyNpbmNsdWRlIDxtdXRleD4KKyNp bmNsdWRlIDx3dGYvZ2xpYi9HTGliVXRpbGl0aWVzLmg+CisKK25hbWVzcGFjZSBXZWJDb3JlIHsK KworI2lmIFBMQVRGT1JNKEdUSykKK3N0YXRpYyBjb25zdCBDU3RyaW5nIHdlYlByb2Nlc3NOYW1l ID0gIldlYktpdFdlYlByb2Nlc3MiOworc3RhdGljIGNvbnN0IENTdHJpbmcgbmV0d29ya1Byb2Nl c3NOYW1lID0gIldlYktpdE5ldHdvcmtQcm9jZXNzIjsKKyNlbGlmIFBMQVRGT1JNKFdQRSkKK3N0 YXRpYyBjb25zdCBDU3RyaW5nIHdlYlByb2Nlc3NOYW1lID0gIldQRVdlYlByb2Nlc3MiOworc3Rh dGljIGNvbnN0IENTdHJpbmcgbmV0d29ya1Byb2Nlc3NOYW1lID0gIldQRU5ldHdvcmtQcm9jZXNz IjsKKyNlbmRpZgorCitib29sIGlzSW5XZWJQcm9jZXNzKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBp c1dlYlByb2Nlc3M7CisgICAgc3RhdGljIHN0ZDo6b25jZV9mbGFnIG9uY2VGbGFnOworICAgIHN0 ZDo6Y2FsbF9vbmNlKG9uY2VGbGFnLCBbXSB7CisgICAgICAgIGlzV2ViUHJvY2VzcyA9IGdldEN1 cnJlbnRFeGVjdXRhYmxlTmFtZSgpID09IHdlYlByb2Nlc3NOYW1lOworICAgIH0pOworICAgIHJl dHVybiBpc1dlYlByb2Nlc3M7Cit9CisKK2Jvb2wgaXNJbk5ldHdvcmtQcm9jZXNzKCkKK3sKKyAg ICBzdGF0aWMgYm9vbCBpc05ldHdvcmtQcm9jZXNzOworICAgIHN0YXRpYyBzdGQ6Om9uY2VfZmxh ZyBvbmNlRmxhZzsKKyAgICBzdGQ6OmNhbGxfb25jZShvbmNlRmxhZywgW10geworICAgICAgICBp c05ldHdvcmtQcm9jZXNzID0gZ2V0Q3VycmVudEV4ZWN1dGFibGVOYW1lKCkgPT0gbmV0d29ya1By b2Nlc3NOYW1lOworICAgIH0pOworICAgIHJldHVybiBpc05ldHdvcmtQcm9jZXNzOworfQorCit9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJSZWdpc3RyeVNj YW5uZXIuY3BwCmluZGV4IGJlMjFkMzljZTQ2NS4uM2E2ZWRiZTdkMjg5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyUmVnaXN0 cnlTY2FubmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyLmNwcApAQCAtMjMsNiArMjMsNyBAQAogI2lm IFVTRShHU1RSRUFNRVIpCiAjaW5jbHVkZSAiQ29udGVudFR5cGUuaCIKICNpbmNsdWRlICJHU3Ry ZWFtZXJDb21tb24uaCIKKyNpbmNsdWRlICJSdW50aW1lQXBwbGljYXRpb25DaGVja3MuaCIKICNp bmNsdWRlIDxmbm1hdGNoLmg+CiAjaW5jbHVkZSA8Z3N0L3BidXRpbHMvY29kZWMtdXRpbHMuaD4K ICNpbmNsdWRlIDx3dGYvUHJpbnRTdHJlYW0uaD4KQEAgLTM5LDYgKzQwLDE0IEBAIEdTdHJlYW1l clJlZ2lzdHJ5U2Nhbm5lciYgR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyOjpzaW5nbGV0b24oKQog ICAgIHJldHVybiBzaGFyZWRJbnN0YW5jZTsKIH0KIAordm9pZCBHU3RyZWFtZXJSZWdpc3RyeVNj YW5uZXI6OmdldFN1cHBvcnRlZERlY29kaW5nVHlwZXMoSGFzaFNldDxTdHJpbmcsIEFTQ0lJQ2Fz ZUluc2Vuc2l0aXZlSGFzaD4mIHR5cGVzKQoreworICAgIGlmIChpc0luV2ViUHJvY2VzcygpKQor ICAgICAgICB0eXBlcyA9IHNpbmdsZXRvbigpLm1pbWVUeXBlU2V0KEdTdHJlYW1lclJlZ2lzdHJ5 U2Nhbm5lcjo6Q29uZmlndXJhdGlvbjo6RGVjb2RpbmcpOworICAgIGVsc2UKKyAgICAgICAgdHlw ZXMgPSBHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXIoKS5taW1lVHlwZVNldChHU3RyZWFtZXJSZWdp c3RyeVNjYW5uZXI6OkNvbmZpZ3VyYXRpb246OkRlY29kaW5nKTsKK30KKwogR1N0cmVhbWVyUmVn aXN0cnlTY2FubmVyOjpFbGVtZW50RmFjdG9yaWVzOjpFbGVtZW50RmFjdG9yaWVzKE9wdGlvblNl dDxFbGVtZW50RmFjdG9yaWVzOjpUeXBlPiB0eXBlcykKIHsKICAgICBpZiAodHlwZXMuY29udGFp bnMoVHlwZTo6QXVkaW9EZWNvZGVyKSkKQEAgLTE3NCw2ICsxODMsOCBAQCBHU3RyZWFtZXJSZWdp c3RyeVNjYW5uZXI6OlJlZ2lzdHJ5TG9va3VwUmVzdWx0IEdTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5l cjo6RWxlbWVudAogR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyOjpHU3RyZWFtZXJSZWdpc3RyeVNj YW5uZXIoYm9vbCBpc01lZGlhU291cmNlKQogICAgIDogbV9pc01lZGlhU291cmNlKGlzTWVkaWFT b3VyY2UpCiB7CisgICAgaWYgKCFpc0luV2ViUHJvY2VzcygpKQorICAgICAgICBnc3RfaW5pdChu dWxscHRyLCBudWxscHRyKTsKICAgICBHU1RfREVCVUdfQ0FURUdPUllfSU5JVCh3ZWJraXRfbWVk aWFfZ3N0X3JlZ2lzdHJ5X3NjYW5uZXJfZGVidWcsICJ3ZWJraXRyZWdpc3RyeXNjYW5uZXIiLCAw LCAiV2ViS2l0IEdTdHJlYW1lciByZWdpc3RyeSBzY2FubmVyIik7CiAKICAgICBFbGVtZW50RmFj dG9yaWVzIGZhY3RvcmllcyhPcHRpb25TZXQ8RWxlbWVudEZhY3Rvcmllczo6VHlwZT46OmZyb21S YXcoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KEVsZW1lbnRGYWN0b3JpZXM6OlR5cGU6OkFsbCkpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJSZWdpc3RyeVNjYW5uZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9HU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXIuaAppbmRleCAwYzNmNjA4OTIz YjcuLjAwN2ZmODgwNzY5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5lci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJSZWdpc3RyeVNjYW5u ZXIuaApAQCAtMzYsOSArMzYsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogY2xhc3MgQ29udGVu dFR5cGU7CiAKIGNsYXNzIEdTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5lciB7Ci0gICAgZnJpZW5kIE5l dmVyRGVzdHJveWVkPEdTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5lcj47CiBwdWJsaWM6CiAgICAgc3Rh dGljIEdTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5lciYgc2luZ2xldG9uKCk7CisgICAgc3RhdGljIHZv aWQgZ2V0U3VwcG9ydGVkRGVjb2RpbmdUeXBlcyhIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNlSW5z ZW5zaXRpdmVIYXNoPiYpOworCisgICAgZXhwbGljaXQgR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVy KGJvb2wgaXNNZWRpYVNvdXJjZSA9IGZhbHNlKTsKKyAgICB+R1N0cmVhbWVyUmVnaXN0cnlTY2Fu bmVyKCkgPSBkZWZhdWx0OwogCiAgICAgZW51bSBDb25maWd1cmF0aW9uIHsKICAgICAgICAgRGVj b2RpbmcgPSAwLApAQCAtNjIsOSArNjUsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBhcmVBbGxDb2Rl Y3NTdXBwb3J0ZWQoQ29uZmlndXJhdGlvbiwgY29uc3QgVmVjdG9yPFN0cmluZz4mIGNvZGVjcywg Ym9vbCBzaG91bGRDaGVja0ZvckhhcmR3YXJlVXNlID0gZmFsc2UpIGNvbnN0OwogCiBwcm90ZWN0 ZWQ6Ci0gICAgR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyKGJvb2wgaXNNZWRpYVNvdXJjZSA9IGZh bHNlKTsKLSAgICB+R1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyKCkgPSBkZWZhdWx0OwotCiAgICAg c3RydWN0IEVsZW1lbnRGYWN0b3JpZXMgewogICAgICAgICBlbnVtIGNsYXNzIFR5cGUgewogICAg ICAgICAgICAgQXVkaW9QYXJzZXIgID0gMSA8PCAwLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCAwZjZjNjZkMjA3NWQuLjk5OGU0NTE4MGMz YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK QEAgLTI2MjEsOCArMjYyMSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpk aWRFbmQoKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6Z2V0U3VwcG9ydGVk VHlwZXMoSGFzaFNldDxTdHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4mIHR5cGVzKQog ewotICAgIGF1dG8mIGdzdFJlZ2lzdHJ5U2Nhbm5lciA9IEdTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5l cjo6c2luZ2xldG9uKCk7Ci0gICAgdHlwZXMgPSBnc3RSZWdpc3RyeVNjYW5uZXIubWltZVR5cGVT ZXQoR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyOjpDb25maWd1cmF0aW9uOjpEZWNvZGluZyk7Cisg ICAgR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyOjpnZXRTdXBwb3J0ZWREZWNvZGluZ1R5cGVzKHR5 cGVzKTsKIH0KIAogTWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZSBNZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXI6OnN1cHBvcnRzVHlwZShjb25zdCBNZWRpYUVuZ2luZVN1cHBvcnRQYXJhbWV0ZXJz JiBwYXJhbWV0ZXJzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL21zZS9HU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJNU0UuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9HU3RyZWFtZXJSZWdpc3Ry eVNjYW5uZXJNU0UuY3BwCmluZGV4IDJjNDk1MzdkYjY1YS4uODZjNWIyYTU1NDQyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL0dTdHJl YW1lclJlZ2lzdHJ5U2Nhbm5lck1TRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9HU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJNU0UuY3BwCkBA IC0xOCwxMSArMTgsMTAgQEAKICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0KLSNpZiBVU0Uo R1NUUkVBTUVSKSAmJiBFTkFCTEUoTUVESUFfU09VUkNFKQogI2luY2x1ZGUgIkdTdHJlYW1lclJl Z2lzdHJ5U2Nhbm5lck1TRS5oIgogCi0jaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+Cisj aWYgVVNFKEdTVFJFQU1FUikgJiYgRU5BQkxFKE1FRElBX1NPVVJDRSkKKyNpbmNsdWRlICJSdW50 aW1lQXBwbGljYXRpb25DaGVja3MuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC0zMiw2 ICszMSwxNSBAQCBHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJNU0UmIEdTdHJlYW1lclJlZ2lzdHJ5 U2Nhbm5lck1TRTo6c2luZ2xldG9uKCkKICAgICByZXR1cm4gc2hhcmVkSW5zdGFuY2U7CiB9CiAK K3ZvaWQgR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyTVNFOjpnZXRTdXBwb3J0ZWREZWNvZGluZ1R5 cGVzKEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+JiB0eXBlcykKK3sK KyAgICBpZiAoaXNJbldlYlByb2Nlc3MoKSkKKyAgICAgICAgdHlwZXMgPSBzaW5nbGV0b24oKS5t aW1lVHlwZVNldChHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXI6OkNvbmZpZ3VyYXRpb246OkRlY29k aW5nKTsKKyAgICBlbHNlCisgICAgICAgIHR5cGVzID0gR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVy TVNFKCkubWltZVR5cGVTZXQoR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyOjpDb25maWd1cmF0aW9u OjpEZWNvZGluZyk7Cit9CisKKwogR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyTVNFOjpHU3RyZWFt ZXJSZWdpc3RyeVNjYW5uZXJNU0UoKQogICAgIDogR1N0cmVhbWVyUmVnaXN0cnlTY2FubmVyOjpH U3RyZWFtZXJSZWdpc3RyeVNjYW5uZXIodHJ1ZSkKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvR1N0cmVhbWVyUmVnaXN0cnlTY2Fu bmVyTVNFLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNl L0dTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5lck1TRS5oCmluZGV4IDBmNTAzNTdjMjRkMy4uMTU5NmVk NTg3NmVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvbXNlL0dTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5lck1TRS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvR1N0cmVhbWVyUmVnaXN0cnlTY2Fu bmVyTVNFLmgKQEAgLTI4LDEwICsyOCw5IEBACiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNz IEdTdHJlYW1lclJlZ2lzdHJ5U2Nhbm5lck1TRSA6IHB1YmxpYyBHU3RyZWFtZXJSZWdpc3RyeVNj YW5uZXIgewotICAgIGZyaWVuZCBOZXZlckRlc3Ryb3llZDxHU3RyZWFtZXJSZWdpc3RyeVNjYW5u ZXJNU0U+OwogcHVibGljOgogICAgIHN0YXRpYyBHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJNU0Um IHNpbmdsZXRvbigpOwotcHJvdGVjdGVkOgorICAgIHN0YXRpYyB2b2lkIGdldFN1cHBvcnRlZERl Y29kaW5nVHlwZXMoSGFzaFNldDxTdHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4mKTsK ICAgICBHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJNU0UoKTsKIH07CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyTVNFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcAppbmRleCBj MzYwZDM5NDA4YzYuLmI5NzBlYzUxZWY1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJN U0UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9t c2UvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcApAQCAtNzMyLDggKzczMiw3IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp0cmFja0RldGVjdGVkKEFwcGVu ZFBpcGVsaW5lJiBhcHBlbmRQaXBlbGluCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyTVNFOjpnZXRTdXBwb3J0ZWRUeXBlcyhIYXNoU2V0PFN0cmluZywgQVNDSUlDYXNlSW5zZW5z aXRpdmVIYXNoPiYgdHlwZXMpCiB7Ci0gICAgYXV0byYgZ3N0UmVnaXN0cnlTY2FubmVyID0gR1N0 cmVhbWVyUmVnaXN0cnlTY2FubmVyTVNFOjpzaW5nbGV0b24oKTsKLSAgICB0eXBlcyA9IGdzdFJl Z2lzdHJ5U2Nhbm5lci5taW1lVHlwZVNldChHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXI6OkNvbmZp Z3VyYXRpb246OkRlY29kaW5nKTsKKyAgICBHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJNU0U6Omdl dFN1cHBvcnRlZERlY29kaW5nVHlwZXModHlwZXMpOwogfQogCiBNZWRpYVBsYXllcjo6U3VwcG9y dHNUeXBlIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6c3VwcG9ydHNUeXBlKGNvbnN0 IE1lZGlhRW5naW5lU3VwcG9ydFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCg==