203742 2019-11-01 09:33:08 -0700 Error: redefinition of 'TransferFunction' 2019-11-04 07:38:46 -0800 1 1 1 Unclassified WebKit CMake WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cathiechen cathiechen cathiechen commit-queue eric.carlson ews-watchlist fred.wang glenn jer.noble philipj sergio oldest_to_newest 1586401 0 cathiechen 2019-11-01 09:33:08 -0700 There is a redefinition error of `TransferFunction` if VideoTextureCopierCV.cpp and MediaEngineConfigurationFactoryCocoa.cpp are put in a same UnifiedSource file. Can we rename one of them? /Volumes/Data/worker/iOS-13-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/DerivedSources/WebCore/unified-sources/UnifiedSource253.cpp:5: ./platform/graphics/cv/VideoTextureCopierCV.cpp:54:12: error: redefinition of 'TransferFunction' enum class TransferFunction { ^ In file included from /Volumes/Data/worker/iOS-13-Simulator-Build-EWS/build/WebKitBuild/Release-iphonesimulator/DerivedSources/WebCore/unified-sources/UnifiedSource253.cpp:1: In file included from ./platform/graphics/cocoa/MediaEngineConfigurationFactoryCocoa.cpp:32: In file included from /Volumes/Data/worker/iOS-13-Simulator-Build-EWS/build/Source/WebCore/platform/MediaCapabilitiesDecodingInfo.h:29: In file included from /Vol umes/Data/worker/iOS-13-Simulator-Build-EWS/build/Source/WebCore/platform/mediacapabilities/MediaDecodingConfiguration.h:28: In file included from /Volumes/Data/worker/iOS-13-Simulator-Build-EWS/build/Source/WebCore/platform/mediacapabilities/MediaConfiguration.h:29: In file included from /Volumes/Data/worker/iOS-13-Simulator-Build-EWS/build/Source/WebCore/platform/mediacapabilities/VideoConfiguration.h:30: /Volumes/Data/worker/iOS-13-Simulator-Build-EWS/build/Source/WebCore/platform/mediacapabilities/TransferFunction.h:30:12: note: previous definition is here enum class TransferFunction { 1586403 1 jer.noble 2019-11-01 09:36:10 -0700 Yes, let’s rename the one in VideoTextureCopierCV.cpp. 1586407 2 cathiechen 2019-11-01 09:45:13 -0700 OK, will do:) 1586411 3 382589 cathiechen 2019-11-01 10:00:07 -0700 Created attachment 382589 Patch 1586833 4 382707 cathiechen 2019-11-03 08:07:47 -0800 Created attachment 382707 Patch 1586979 5 382707 commit-queue 2019-11-04 07:38:44 -0800 Comment on attachment 382707 Patch Clearing flags on attachment: 382707 Committed r251988: <https://trac.webkit.org/changeset/251988> 1586980 6 commit-queue 2019-11-04 07:38:46 -0800 All reviewed patches have been landed. Closing bug. 382589 2019-11-01 10:00:07 -0700 2019-11-03 08:07:43 -0800 Patch bug-203742-20191102010004.patch text/plain 6427 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxOTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGQ5ZThlMjE2MzVlZmY1 ZDFlYzkxMTZjOTJlODYyYWQ5N2YzNTYxMS4uMzMzMjFlY2U2ZDcyNTViNzhhYjI0MzMwYmM4NDA5 YjY2NzU4MWIwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTExLTAxICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBCdWlsZCBlcnJvcjog cmVkZWZpbml0aW9uIG9mIGBUcmFuc2ZlckZ1bmN0aW9uYAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYFRyYW5zZmVyRnVuY3Rpb25gIGRlZmluZWQgaW4g Ym90aCBWaWRlb1RleHR1cmVDb3BpZXJDVi5jcHAgYW5kIFRyYW5zZmVyRnVuY3Rpb24uaC4KKyAg ICAgICAgUmVuYW1lZCBgVHJhbnNmZXJGdW5jdGlvbmAgaW4gVmlkZW9UZXh0dXJlQ29waWVyQ1Yu Y3BwIHRvIGBUcmFuc2ZlckZ1bmN0aW9uQ1ZgLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvY3YvVmlkZW9UZXh0dXJlQ29waWVyQ1YuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dHJhbnNm ZXJGdW5jdGlvbkZyb21TdHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6WUNiQ3JUb1JHQk1hdHJp eEZvclJhbmdlQW5kVHJhbnNmZXJGdW5jdGlvbik6CisKIDIwMTktMTEtMDEgIFphbiBEb2JlcnNl ayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPiAgYW5kICBDaHJpcyBMb3JkICA8Y2xvcmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkRCYXNlOiB1c2UgQ2FudmFz QmFzZSBtb3JlIGV4dGVuc2l2ZWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jdi9WaWRlb1RleHR1cmVDb3BpZXJDVi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1cmVDb3BpZXJDVi5jcHAKaW5kZXggNzVhZDQ4 NzcwNGZmN2I0OGU1MzYxZTVjNTNmOGJhNDE4YWRiMjIzYi4uZDk3NWRmYzhhYzFhOGYxOTY4YWYx NmI3N2FlZjM5NTE4MmNjNDI4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY3YvVmlkZW9UZXh0dXJlQ29waWVyQ1YuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2N2L1ZpZGVvVGV4dHVyZUNvcGllckNWLmNwcApAQCAtNTEsNyAr NTEsNyBAQCBlbnVtIGNsYXNzIFBpeGVsUmFuZ2UgewogICAgIEZ1bGwsCiB9OwogCi1lbnVtIGNs YXNzIFRyYW5zZmVyRnVuY3Rpb24geworZW51bSBjbGFzcyBUcmFuc2ZlckZ1bmN0aW9uQ1Ygewog ICAgIFVua25vd24sCiAgICAga0lUVV9SXzcwOV8yLAogICAgIGtJVFVfUl82MDFfNCwKQEAgLTg1 LDIzICs4NSwyMyBAQCBzdGF0aWMgUGl4ZWxSYW5nZSBwaXhlbFJhbmdlRnJvbVBpeGVsRm9ybWF0 KE9TVHlwZSBwaXhlbEZvcm1hdCkKICAgICB9CiB9CiAKLXN0YXRpYyBUcmFuc2ZlckZ1bmN0aW9u IHRyYW5zZmVyRnVuY3Rpb25Gcm9tU3RyaW5nKENGU3RyaW5nUmVmIHN0cmluZykKK3N0YXRpYyBU cmFuc2ZlckZ1bmN0aW9uQ1YgdHJhbnNmZXJGdW5jdGlvbkZyb21TdHJpbmcoQ0ZTdHJpbmdSZWYg c3RyaW5nKQogewogICAgIGlmICghc3RyaW5nIHx8IENGR2V0VHlwZUlEKHN0cmluZykgIT0gQ0ZT dHJpbmdHZXRUeXBlSUQoKSkKLSAgICAgICAgcmV0dXJuIFRyYW5zZmVyRnVuY3Rpb246OlVua25v d247CisgICAgICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OlVua25vd247CiAgICAgaWYg KENGRXF1YWwoc3RyaW5nLCBrQ1ZJbWFnZUJ1ZmZlcllDYkNyTWF0cml4X0lUVV9SXzcwOV8yKSkK LSAgICAgICAgcmV0dXJuIFRyYW5zZmVyRnVuY3Rpb246OmtJVFVfUl83MDlfMjsKKyAgICAgICAg cmV0dXJuIFRyYW5zZmVyRnVuY3Rpb25DVjo6a0lUVV9SXzcwOV8yOwogICAgIGlmIChDRkVxdWFs KHN0cmluZywga0NWSW1hZ2VCdWZmZXJZQ2JDck1hdHJpeF9JVFVfUl82MDFfNCkpCi0gICAgICAg IHJldHVybiBUcmFuc2ZlckZ1bmN0aW9uOjprSVRVX1JfNjAxXzQ7CisgICAgICAgIHJldHVybiBU cmFuc2ZlckZ1bmN0aW9uQ1Y6OmtJVFVfUl82MDFfNDsKICAgICBpZiAoQ0ZFcXVhbChzdHJpbmcs IGtDVkltYWdlQnVmZmVyWUNiQ3JNYXRyaXhfU01QVEVfMjQwTV8xOTk1KSkKLSAgICAgICAgcmV0 dXJuIFRyYW5zZmVyRnVuY3Rpb246OmtTTVBURV8yNDBNXzE5OTU7CisgICAgICAgIHJldHVybiBU cmFuc2ZlckZ1bmN0aW9uQ1Y6OmtTTVBURV8yNDBNXzE5OTU7CiAgICAgaWYgKGNhbkxvYWRfQ29y ZVZpZGVvX2tDVkltYWdlQnVmZmVyWUNiQ3JNYXRyaXhfRENJX1AzKCkgJiYgQ0ZFcXVhbChzdHJp bmcsIGtDVkltYWdlQnVmZmVyWUNiQ3JNYXRyaXhfRENJX1AzKSkKLSAgICAgICAgcmV0dXJuIFRy YW5zZmVyRnVuY3Rpb246OmtEQ0lfUDM7CisgICAgICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0aW9u Q1Y6OmtEQ0lfUDM7CiAgICAgaWYgKGNhbkxvYWRfQ29yZVZpZGVvX2tDVkltYWdlQnVmZmVyWUNi Q3JNYXRyaXhfUDNfRDY1KCkgJiYgQ0ZFcXVhbChzdHJpbmcsIGtDVkltYWdlQnVmZmVyWUNiQ3JN YXRyaXhfUDNfRDY1KSkKLSAgICAgICAgcmV0dXJuIFRyYW5zZmVyRnVuY3Rpb246OmtQM19ENjU7 CisgICAgICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OmtQM19ENjU7CiAgICAgaWYgKGNh bkxvYWRfQ29yZVZpZGVvX2tDVkltYWdlQnVmZmVyWUNiQ3JNYXRyaXhfSVRVX1JfMjAyMCgpICYm IENGRXF1YWwoc3RyaW5nLCBrQ1ZJbWFnZUJ1ZmZlcllDYkNyTWF0cml4X0lUVV9SXzIwMjApKQot ICAgICAgICByZXR1cm4gVHJhbnNmZXJGdW5jdGlvbjo6a0lUVV9SXzIwMjA7Ci0gICAgcmV0dXJu IFRyYW5zZmVyRnVuY3Rpb246OlVua25vd247CisgICAgICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0 aW9uQ1Y6OmtJVFVfUl8yMDIwOworICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OlVua25v d247CiB9CiAKIHN0cnVjdCBHTGZsb2F0Q29sb3IgewpAQCAtMjM2LDkgKzIzNiw5IEBAIGNvbnN0 ZXhwciBHTGZsb2F0Q29sb3IgWUNiQ3JNYXRyaXg6Om9wZXJhdG9yKihjb25zdCBHTGZsb2F0Q29s b3ImIGNvbG9yKSBjb25zdAogICAgICk7CiB9CiAKLXN0YXRpYyBjb25zdCBWZWN0b3I8R0xmbG9h dD4gWUNiQ3JUb1JHQk1hdHJpeEZvclJhbmdlQW5kVHJhbnNmZXJGdW5jdGlvbihQaXhlbFJhbmdl IHJhbmdlLCBUcmFuc2ZlckZ1bmN0aW9uIHRyYW5zZmVyRnVuY3Rpb24pCitzdGF0aWMgY29uc3Qg VmVjdG9yPEdMZmxvYXQ+IFlDYkNyVG9SR0JNYXRyaXhGb3JSYW5nZUFuZFRyYW5zZmVyRnVuY3Rp b24oUGl4ZWxSYW5nZSByYW5nZSwgVHJhbnNmZXJGdW5jdGlvbkNWIHRyYW5zZmVyRnVuY3Rpb24p CiB7Ci0gICAgdXNpbmcgTWFwS2V5ID0gc3RkOjpwYWlyPFBpeGVsUmFuZ2UsIFRyYW5zZmVyRnVu Y3Rpb24+OworICAgIHVzaW5nIE1hcEtleSA9IHN0ZDo6cGFpcjxQaXhlbFJhbmdlLCBUcmFuc2Zl ckZ1bmN0aW9uQ1Y+OwogICAgIHVzaW5nIE1hdHJpeE1hcCA9IFN0ZE1hcDxNYXBLZXksIFZlY3Rv cjxHTGZsb2F0Pj47CiAKICAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8TWF0cml4TWFwPiBtYXRy aWNlczsKQEAgLTMzNywxNCArMzM3LDE0IEBAIHN0YXRpYyBjb25zdCBWZWN0b3I8R0xmbG9hdD4g WUNiQ3JUb1JHQk1hdHJpeEZvclJhbmdlQW5kVHJhbnNmZXJGdW5jdGlvbihQaXhlbFJhCiAgICAg c3RhdGljX2Fzc2VydCgoc21wdGUyNDBNRnVsbE1hdHJpeCAqIEdMZmxvYXRDb2xvcigyMDEsIDE1 OCwgMSwgICAyNTUpKS5pc0FwcHJveGltYXRlbHlFcXVhbFRvKEdMZmxvYXRDb2xvcnM6OmN5YW4s ICAgIDEuNWYgLyAyNTUuZiksICJTTVBURSAyNDBNIGZ1bGwgbWF0cml4IGRvZXMgbm90IHByb2R1 Y2UgY3lhbiBjb2xvciIpOwogCiAgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRva2VuLCBeewotICAg ICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtleShQaXhlbFJhbmdlOjpWaWRlbywgVHJh bnNmZXJGdW5jdGlvbjo6a0lUVV9SXzYwMV80KSwgcjYwMVZpZGVvTWF0cml4KTsKLSAgICAgICAg bWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5nZTo6RnVsbCwgVHJhbnNmZXJG dW5jdGlvbjo6a0lUVV9SXzYwMV80KSwgcjYwMUZ1bGxNYXRyaXgpOwotICAgICAgICBtYXRyaWNl cy5nZXQoKS5lbXBsYWNlKE1hcEtleShQaXhlbFJhbmdlOjpWaWRlbywgVHJhbnNmZXJGdW5jdGlv bjo6a0lUVV9SXzcwOV8yKSwgcjcwOVZpZGVvTWF0cml4KTsKLSAgICAgICAgbWF0cmljZXMuZ2V0 KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5nZTo6RnVsbCwgVHJhbnNmZXJGdW5jdGlvbjo6a0lU VV9SXzcwOV8yKSwgcjcwOUZ1bGxNYXRyaXgpOwotICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBs YWNlKE1hcEtleShQaXhlbFJhbmdlOjpWaWRlbywgVHJhbnNmZXJGdW5jdGlvbjo6a0lUVV9SXzIw MjApLCBidDIwMjBWaWRlb01hdHJpeCk7Ci0gICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2Uo TWFwS2V5KFBpeGVsUmFuZ2U6OkZ1bGwsIFRyYW5zZmVyRnVuY3Rpb246OmtJVFVfUl8yMDIwKSwg YnQyMDIwRnVsbE1hdHJpeCk7Ci0gICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2UoTWFwS2V5 KFBpeGVsUmFuZ2U6OlZpZGVvLCBUcmFuc2ZlckZ1bmN0aW9uOjprU01QVEVfMjQwTV8xOTk1KSwg c21wdGUyNDBNVmlkZW9NYXRyaXgpOwotICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1h cEtleShQaXhlbFJhbmdlOjpGdWxsLCBUcmFuc2ZlckZ1bmN0aW9uOjprU01QVEVfMjQwTV8xOTk1 KSwgc21wdGUyNDBNRnVsbE1hdHJpeCk7CisgICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2Uo TWFwS2V5KFBpeGVsUmFuZ2U6OlZpZGVvLCBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OmtJVFVfUl82MDFf NCksIHI2MDFWaWRlb01hdHJpeCk7CisgICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2UoTWFw S2V5KFBpeGVsUmFuZ2U6OkZ1bGwsIFRyYW5zZmVyRnVuY3Rpb25DVjo6a0lUVV9SXzYwMV80KSwg cjYwMUZ1bGxNYXRyaXgpOworICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtleShQ aXhlbFJhbmdlOjpWaWRlbywgVHJhbnNmZXJGdW5jdGlvbkNWOjprSVRVX1JfNzA5XzIpLCByNzA5 VmlkZW9NYXRyaXgpOworICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtleShQaXhl bFJhbmdlOjpGdWxsLCBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OmtJVFVfUl83MDlfMiksIHI3MDlGdWxs TWF0cml4KTsKKyAgICAgICAgbWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5n ZTo6VmlkZW8sIFRyYW5zZmVyRnVuY3Rpb25DVjo6a0lUVV9SXzIwMjApLCBidDIwMjBWaWRlb01h dHJpeCk7CisgICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2UoTWFwS2V5KFBpeGVsUmFuZ2U6 OkZ1bGwsIFRyYW5zZmVyRnVuY3Rpb25DVjo6a0lUVV9SXzIwMjApLCBidDIwMjBGdWxsTWF0cml4 KTsKKyAgICAgICAgbWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5nZTo6Vmlk ZW8sIFRyYW5zZmVyRnVuY3Rpb25DVjo6a1NNUFRFXzI0ME1fMTk5NSksIHNtcHRlMjQwTVZpZGVv TWF0cml4KTsKKyAgICAgICAgbWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5n ZTo6RnVsbCwgVHJhbnNmZXJGdW5jdGlvbkNWOjprU01QVEVfMjQwTV8xOTk1KSwgc21wdGUyNDBN RnVsbE1hdHJpeCk7CiAgICAgfSk7CiAKICAgICAvLyBXZSBzaG91bGQgbmV2ZXIgYmUgYXNrZWQg dG8gaGFuZGxlIGEgUGl4ZWwgRm9ybWF0IHdob3NlIHJhbmdlIHZhbHVlIGlzIHVua25vd24uCkBA IC0zNTYsNyArMzU2LDcgQEAgc3RhdGljIGNvbnN0IFZlY3RvcjxHTGZsb2F0PiBZQ2JDclRvUkdC TWF0cml4Rm9yUmFuZ2VBbmRUcmFuc2ZlckZ1bmN0aW9uKFBpeGVsUmEKIAogICAgIC8vIEFzc3Vt ZSB1bmtub3duIHRyYW5zZmVyIGZ1bmN0aW9ucyBhcmUgci42MDE6CiAgICAgaWYgKGl0ZXJhdG9y ID09IG1hdHJpY2VzLmdldCgpLmVuZCgpKQotICAgICAgICBpdGVyYXRvciA9IG1hdHJpY2VzLmdl dCgpLmZpbmQoe3JhbmdlLCBUcmFuc2ZlckZ1bmN0aW9uOjprSVRVX1JfNjAxXzR9KTsKKyAgICAg ICAgaXRlcmF0b3IgPSBtYXRyaWNlcy5nZXQoKS5maW5kKHtyYW5nZSwgVHJhbnNmZXJGdW5jdGlv bkNWOjprSVRVX1JfNjAxXzR9KTsKIAogICAgIEFTU0VSVChpdGVyYXRvciAhPSBtYXRyaWNlcy5n ZXQoKS5lbmQoKSk7CiAgICAgcmV0dXJuIGl0ZXJhdG9yLT5zZWNvbmQ7Cg== 382707 2019-11-03 08:07:47 -0800 2019-11-04 07:38:44 -0800 Patch bug-203742-20191104000745.patch text/plain 6422 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxOTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGQ5ZThlMjE2MzVlZmY1 ZDFlYzkxMTZjOTJlODYyYWQ5N2YzNTYxMS4uY2E4Mzk5N2QyNDBmMTRjNWJjZjY5NDdkY2RjODBm OTI1ZGRlYjhiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTExLTAxICBDYXRo aWUgQ2hlbiAgPGNhdGhpZWNoZW5AaWdhbGlhLmNvbT4KKworICAgICAgICBCdWlsZCBlcnJvcjog cmVkZWZpbml0aW9uIG9mIGBUcmFuc2ZlckZ1bmN0aW9uYAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAzNzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg SmVyIE5vYmxlLgorCisgICAgICAgIGBUcmFuc2ZlckZ1bmN0aW9uYCBkZWZpbmVkIGluIGJvdGgg VmlkZW9UZXh0dXJlQ29waWVyQ1YuY3BwIGFuZCBUcmFuc2ZlckZ1bmN0aW9uLmguCisgICAgICAg IFJlbmFtZWQgYFRyYW5zZmVyRnVuY3Rpb25gIGluIFZpZGVvVGV4dHVyZUNvcGllckNWLmNwcCB0 byBgVHJhbnNmZXJGdW5jdGlvbkNWYC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2N2 L1ZpZGVvVGV4dHVyZUNvcGllckNWLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRyYW5zZmVyRnVu Y3Rpb25Gcm9tU3RyaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OllDYkNyVG9SR0JNYXRyaXhGb3JS YW5nZUFuZFRyYW5zZmVyRnVuY3Rpb24pOgorCiAyMDE5LTExLTAxICBaYW4gRG9iZXJzZWsgIDx6 ZG9iZXJzZWtAaWdhbGlhLmNvbT4gIGFuZCAgQ2hyaXMgTG9yZCAgPGNsb3JkQGlnYWxpYS5jb20+ CiAKICAgICAgICAgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEQmFzZTogdXNlIENhbnZhc0Jhc2Ug bW9yZSBleHRlbnNpdmVseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY3YvVmlkZW9UZXh0dXJlQ29waWVyQ1YuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY3YvVmlkZW9UZXh0dXJlQ29waWVyQ1YuY3BwCmluZGV4IDc1YWQ0ODc3MDRm ZjdiNDhlNTM2MWU1YzUzZjhiYTQxOGFkYjIyM2IuLmQ5NzVkZmM4YWMxYThmMTk2OGFmMTZiNzdh ZWYzOTUxODJjYzQyOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2N2L1ZpZGVvVGV4dHVyZUNvcGllckNWLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jdi9WaWRlb1RleHR1cmVDb3BpZXJDVi5jcHAKQEAgLTUxLDcgKzUxLDcg QEAgZW51bSBjbGFzcyBQaXhlbFJhbmdlIHsKICAgICBGdWxsLAogfTsKIAotZW51bSBjbGFzcyBU cmFuc2ZlckZ1bmN0aW9uIHsKK2VudW0gY2xhc3MgVHJhbnNmZXJGdW5jdGlvbkNWIHsKICAgICBV bmtub3duLAogICAgIGtJVFVfUl83MDlfMiwKICAgICBrSVRVX1JfNjAxXzQsCkBAIC04NSwyMyAr ODUsMjMgQEAgc3RhdGljIFBpeGVsUmFuZ2UgcGl4ZWxSYW5nZUZyb21QaXhlbEZvcm1hdChPU1R5 cGUgcGl4ZWxGb3JtYXQpCiAgICAgfQogfQogCi1zdGF0aWMgVHJhbnNmZXJGdW5jdGlvbiB0cmFu c2ZlckZ1bmN0aW9uRnJvbVN0cmluZyhDRlN0cmluZ1JlZiBzdHJpbmcpCitzdGF0aWMgVHJhbnNm ZXJGdW5jdGlvbkNWIHRyYW5zZmVyRnVuY3Rpb25Gcm9tU3RyaW5nKENGU3RyaW5nUmVmIHN0cmlu ZykKIHsKICAgICBpZiAoIXN0cmluZyB8fCBDRkdldFR5cGVJRChzdHJpbmcpICE9IENGU3RyaW5n R2V0VHlwZUlEKCkpCi0gICAgICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0aW9uOjpVbmtub3duOwor ICAgICAgICByZXR1cm4gVHJhbnNmZXJGdW5jdGlvbkNWOjpVbmtub3duOwogICAgIGlmIChDRkVx dWFsKHN0cmluZywga0NWSW1hZ2VCdWZmZXJZQ2JDck1hdHJpeF9JVFVfUl83MDlfMikpCi0gICAg ICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0aW9uOjprSVRVX1JfNzA5XzI7CisgICAgICAgIHJldHVy biBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OmtJVFVfUl83MDlfMjsKICAgICBpZiAoQ0ZFcXVhbChzdHJp bmcsIGtDVkltYWdlQnVmZmVyWUNiQ3JNYXRyaXhfSVRVX1JfNjAxXzQpKQotICAgICAgICByZXR1 cm4gVHJhbnNmZXJGdW5jdGlvbjo6a0lUVV9SXzYwMV80OworICAgICAgICByZXR1cm4gVHJhbnNm ZXJGdW5jdGlvbkNWOjprSVRVX1JfNjAxXzQ7CiAgICAgaWYgKENGRXF1YWwoc3RyaW5nLCBrQ1ZJ bWFnZUJ1ZmZlcllDYkNyTWF0cml4X1NNUFRFXzI0ME1fMTk5NSkpCi0gICAgICAgIHJldHVybiBU cmFuc2ZlckZ1bmN0aW9uOjprU01QVEVfMjQwTV8xOTk1OworICAgICAgICByZXR1cm4gVHJhbnNm ZXJGdW5jdGlvbkNWOjprU01QVEVfMjQwTV8xOTk1OwogICAgIGlmIChjYW5Mb2FkX0NvcmVWaWRl b19rQ1ZJbWFnZUJ1ZmZlcllDYkNyTWF0cml4X0RDSV9QMygpICYmIENGRXF1YWwoc3RyaW5nLCBr Q1ZJbWFnZUJ1ZmZlcllDYkNyTWF0cml4X0RDSV9QMykpCi0gICAgICAgIHJldHVybiBUcmFuc2Zl ckZ1bmN0aW9uOjprRENJX1AzOworICAgICAgICByZXR1cm4gVHJhbnNmZXJGdW5jdGlvbkNWOjpr RENJX1AzOwogICAgIGlmIChjYW5Mb2FkX0NvcmVWaWRlb19rQ1ZJbWFnZUJ1ZmZlcllDYkNyTWF0 cml4X1AzX0Q2NSgpICYmIENGRXF1YWwoc3RyaW5nLCBrQ1ZJbWFnZUJ1ZmZlcllDYkNyTWF0cml4 X1AzX0Q2NSkpCi0gICAgICAgIHJldHVybiBUcmFuc2ZlckZ1bmN0aW9uOjprUDNfRDY1OworICAg ICAgICByZXR1cm4gVHJhbnNmZXJGdW5jdGlvbkNWOjprUDNfRDY1OwogICAgIGlmIChjYW5Mb2Fk X0NvcmVWaWRlb19rQ1ZJbWFnZUJ1ZmZlcllDYkNyTWF0cml4X0lUVV9SXzIwMjAoKSAmJiBDRkVx dWFsKHN0cmluZywga0NWSW1hZ2VCdWZmZXJZQ2JDck1hdHJpeF9JVFVfUl8yMDIwKSkKLSAgICAg ICAgcmV0dXJuIFRyYW5zZmVyRnVuY3Rpb246OmtJVFVfUl8yMDIwOwotICAgIHJldHVybiBUcmFu c2ZlckZ1bmN0aW9uOjpVbmtub3duOworICAgICAgICByZXR1cm4gVHJhbnNmZXJGdW5jdGlvbkNW OjprSVRVX1JfMjAyMDsKKyAgICByZXR1cm4gVHJhbnNmZXJGdW5jdGlvbkNWOjpVbmtub3duOwog fQogCiBzdHJ1Y3QgR0xmbG9hdENvbG9yIHsKQEAgLTIzNiw5ICsyMzYsOSBAQCBjb25zdGV4cHIg R0xmbG9hdENvbG9yIFlDYkNyTWF0cml4OjpvcGVyYXRvciooY29uc3QgR0xmbG9hdENvbG9yJiBj b2xvcikgY29uc3QKICAgICApOwogfQogCi1zdGF0aWMgY29uc3QgVmVjdG9yPEdMZmxvYXQ+IFlD YkNyVG9SR0JNYXRyaXhGb3JSYW5nZUFuZFRyYW5zZmVyRnVuY3Rpb24oUGl4ZWxSYW5nZSByYW5n ZSwgVHJhbnNmZXJGdW5jdGlvbiB0cmFuc2ZlckZ1bmN0aW9uKQorc3RhdGljIGNvbnN0IFZlY3Rv cjxHTGZsb2F0PiBZQ2JDclRvUkdCTWF0cml4Rm9yUmFuZ2VBbmRUcmFuc2ZlckZ1bmN0aW9uKFBp eGVsUmFuZ2UgcmFuZ2UsIFRyYW5zZmVyRnVuY3Rpb25DViB0cmFuc2ZlckZ1bmN0aW9uKQogewot ICAgIHVzaW5nIE1hcEtleSA9IHN0ZDo6cGFpcjxQaXhlbFJhbmdlLCBUcmFuc2ZlckZ1bmN0aW9u PjsKKyAgICB1c2luZyBNYXBLZXkgPSBzdGQ6OnBhaXI8UGl4ZWxSYW5nZSwgVHJhbnNmZXJGdW5j dGlvbkNWPjsKICAgICB1c2luZyBNYXRyaXhNYXAgPSBTdGRNYXA8TWFwS2V5LCBWZWN0b3I8R0xm bG9hdD4+OwogCiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPE1hdHJpeE1hcD4gbWF0cmljZXM7 CkBAIC0zMzcsMTQgKzMzNywxNCBAQCBzdGF0aWMgY29uc3QgVmVjdG9yPEdMZmxvYXQ+IFlDYkNy VG9SR0JNYXRyaXhGb3JSYW5nZUFuZFRyYW5zZmVyRnVuY3Rpb24oUGl4ZWxSYQogICAgIHN0YXRp Y19hc3NlcnQoKHNtcHRlMjQwTUZ1bGxNYXRyaXggKiBHTGZsb2F0Q29sb3IoMjAxLCAxNTgsIDEs ICAgMjU1KSkuaXNBcHByb3hpbWF0ZWx5RXF1YWxUbyhHTGZsb2F0Q29sb3JzOjpjeWFuLCAgICAx LjVmIC8gMjU1LmYpLCAiU01QVEUgMjQwTSBmdWxsIG1hdHJpeCBkb2VzIG5vdCBwcm9kdWNlIGN5 YW4gY29sb3IiKTsKIAogICAgIGRpc3BhdGNoX29uY2UoJm9uY2VUb2tlbiwgXnsKLSAgICAgICAg bWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5nZTo6VmlkZW8sIFRyYW5zZmVy RnVuY3Rpb246OmtJVFVfUl82MDFfNCksIHI2MDFWaWRlb01hdHJpeCk7Ci0gICAgICAgIG1hdHJp Y2VzLmdldCgpLmVtcGxhY2UoTWFwS2V5KFBpeGVsUmFuZ2U6OkZ1bGwsIFRyYW5zZmVyRnVuY3Rp b246OmtJVFVfUl82MDFfNCksIHI2MDFGdWxsTWF0cml4KTsKLSAgICAgICAgbWF0cmljZXMuZ2V0 KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5nZTo6VmlkZW8sIFRyYW5zZmVyRnVuY3Rpb246OmtJ VFVfUl83MDlfMiksIHI3MDlWaWRlb01hdHJpeCk7Ci0gICAgICAgIG1hdHJpY2VzLmdldCgpLmVt cGxhY2UoTWFwS2V5KFBpeGVsUmFuZ2U6OkZ1bGwsIFRyYW5zZmVyRnVuY3Rpb246OmtJVFVfUl83 MDlfMiksIHI3MDlGdWxsTWF0cml4KTsKLSAgICAgICAgbWF0cmljZXMuZ2V0KCkuZW1wbGFjZShN YXBLZXkoUGl4ZWxSYW5nZTo6VmlkZW8sIFRyYW5zZmVyRnVuY3Rpb246OmtJVFVfUl8yMDIwKSwg YnQyMDIwVmlkZW9NYXRyaXgpOwotICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtl eShQaXhlbFJhbmdlOjpGdWxsLCBUcmFuc2ZlckZ1bmN0aW9uOjprSVRVX1JfMjAyMCksIGJ0MjAy MEZ1bGxNYXRyaXgpOwotICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtleShQaXhl bFJhbmdlOjpWaWRlbywgVHJhbnNmZXJGdW5jdGlvbjo6a1NNUFRFXzI0ME1fMTk5NSksIHNtcHRl MjQwTVZpZGVvTWF0cml4KTsKLSAgICAgICAgbWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXko UGl4ZWxSYW5nZTo6RnVsbCwgVHJhbnNmZXJGdW5jdGlvbjo6a1NNUFRFXzI0ME1fMTk5NSksIHNt cHRlMjQwTUZ1bGxNYXRyaXgpOworICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtl eShQaXhlbFJhbmdlOjpWaWRlbywgVHJhbnNmZXJGdW5jdGlvbkNWOjprSVRVX1JfNjAxXzQpLCBy NjAxVmlkZW9NYXRyaXgpOworICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtleShQ aXhlbFJhbmdlOjpGdWxsLCBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OmtJVFVfUl82MDFfNCksIHI2MDFG dWxsTWF0cml4KTsKKyAgICAgICAgbWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxS YW5nZTo6VmlkZW8sIFRyYW5zZmVyRnVuY3Rpb25DVjo6a0lUVV9SXzcwOV8yKSwgcjcwOVZpZGVv TWF0cml4KTsKKyAgICAgICAgbWF0cmljZXMuZ2V0KCkuZW1wbGFjZShNYXBLZXkoUGl4ZWxSYW5n ZTo6RnVsbCwgVHJhbnNmZXJGdW5jdGlvbkNWOjprSVRVX1JfNzA5XzIpLCByNzA5RnVsbE1hdHJp eCk7CisgICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2UoTWFwS2V5KFBpeGVsUmFuZ2U6OlZp ZGVvLCBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OmtJVFVfUl8yMDIwKSwgYnQyMDIwVmlkZW9NYXRyaXgp OworICAgICAgICBtYXRyaWNlcy5nZXQoKS5lbXBsYWNlKE1hcEtleShQaXhlbFJhbmdlOjpGdWxs LCBUcmFuc2ZlckZ1bmN0aW9uQ1Y6OmtJVFVfUl8yMDIwKSwgYnQyMDIwRnVsbE1hdHJpeCk7Cisg ICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2UoTWFwS2V5KFBpeGVsUmFuZ2U6OlZpZGVvLCBU cmFuc2ZlckZ1bmN0aW9uQ1Y6OmtTTVBURV8yNDBNXzE5OTUpLCBzbXB0ZTI0ME1WaWRlb01hdHJp eCk7CisgICAgICAgIG1hdHJpY2VzLmdldCgpLmVtcGxhY2UoTWFwS2V5KFBpeGVsUmFuZ2U6OkZ1 bGwsIFRyYW5zZmVyRnVuY3Rpb25DVjo6a1NNUFRFXzI0ME1fMTk5NSksIHNtcHRlMjQwTUZ1bGxN YXRyaXgpOwogICAgIH0pOwogCiAgICAgLy8gV2Ugc2hvdWxkIG5ldmVyIGJlIGFza2VkIHRvIGhh bmRsZSBhIFBpeGVsIEZvcm1hdCB3aG9zZSByYW5nZSB2YWx1ZSBpcyB1bmtub3duLgpAQCAtMzU2 LDcgKzM1Niw3IEBAIHN0YXRpYyBjb25zdCBWZWN0b3I8R0xmbG9hdD4gWUNiQ3JUb1JHQk1hdHJp eEZvclJhbmdlQW5kVHJhbnNmZXJGdW5jdGlvbihQaXhlbFJhCiAKICAgICAvLyBBc3N1bWUgdW5r bm93biB0cmFuc2ZlciBmdW5jdGlvbnMgYXJlIHIuNjAxOgogICAgIGlmIChpdGVyYXRvciA9PSBt YXRyaWNlcy5nZXQoKS5lbmQoKSkKLSAgICAgICAgaXRlcmF0b3IgPSBtYXRyaWNlcy5nZXQoKS5m aW5kKHtyYW5nZSwgVHJhbnNmZXJGdW5jdGlvbjo6a0lUVV9SXzYwMV80fSk7CisgICAgICAgIGl0 ZXJhdG9yID0gbWF0cmljZXMuZ2V0KCkuZmluZCh7cmFuZ2UsIFRyYW5zZmVyRnVuY3Rpb25DVjo6 a0lUVV9SXzYwMV80fSk7CiAKICAgICBBU1NFUlQoaXRlcmF0b3IgIT0gbWF0cmljZXMuZ2V0KCku ZW5kKCkpOwogICAgIHJldHVybiBpdGVyYXRvci0+c2Vjb25kOwo=