233448 2021-11-23 09:04:07 -0800 [CMake][MSVC] Compile with /permissive- 2022-01-06 12:00:56 -0800 1 1 1 Unclassified WebKit CMake WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 234498 234501 234503 234504 234505 234546 233963 1 don.olmstead fujii annulen dino ews-watchlist fmalita fujii gyuyoung.kim kbr kondapallykalyan pdr ryuan.choi sabouhallawa schenney sergio stephan.szabo oldest_to_newest 1817480 0 don.olmstead 2021-11-23 09:04:07 -0800 It provides better C++ conformance and will be turned on when compiling C++20. 1817486 1 445038 don.olmstead 2021-11-23 09:26:30 -0800 Created attachment 445038 WIP Patch 1817487 2 ews-watchlist 2021-11-23 09:27:42 -0800 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1825874 3 fujii 2021-12-20 21:40:48 -0800 I'm going to fix the compilation errors in sub tickets. However, there are more warnings C5054 and C5055. I think we shoud suppress them. Source\WebCore\rendering\style\RenderStyleConstants.h(1093): warning C5054: operator '|': deprecated between enumerations of different types Source\WebCore\rendering\style\RenderStyleConstants.h(1094): warning C5054: operator '|': deprecated between enumerations of different types Source\WebCore\rendering\style\RenderStyleConstants.h(1095): warning C5054: operator '|': deprecated between enumerations of different types Source\WebCore\rendering\style\RenderStyleConstants.h(1096): warning C5054: operator '|': deprecated between enumerations of different types Source\ThirdParty\ANGLE\src\libANGLE/Program.h(755): warning C5054: operator '+': deprecated between enumerations of different types Source\ThirdParty\ANGLE\src\libANGLE/VertexArray.h(145): warning C5054: operator '+': deprecated between enumerations of different types Source\ThirdParty\ANGLE\src\libANGLE/VertexArray.h(149): warning C5054: operator '+': deprecated between enumerations of different types Source\ThirdParty\ANGLE\src\libANGLE/VertexArray.h(153): warning C5054: operator '+': deprecated between enumerations of different types Source\WebCore\platform\graphics\nicosia\NicosiaAnimation.cpp(232): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\animation/CSSAnimation.cpp(103): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\css/CSSComputedStyleDeclaration.cpp(3568): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(48): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(50): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(53): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(61): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(62): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(65): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(72): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(73): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(76): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(148): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(148): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(151): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(151): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(154): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(154): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(157): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(160): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(160): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(163): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(163): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(166): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(169): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(172): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(172): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(194): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(199): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(208): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(210): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(212): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(222): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(223): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(225): warning C5055: operator '!=': deprecated between enumerations and floating-point types Source\WebCore\dom/ViewportArguments.cpp(232): warning C5055: operator '==': deprecated between enumerations and floating-point types Source\WebCore\dom/WheelEvent.cpp(64): warning C5055: operator '*': deprecated between enumerations and floating-point types Source\WebCore\dom/WheelEvent.cpp(64): warning C5055: operator '*': deprecated between enumerations and floating-point types 1826223 4 447783 fujii 2021-12-21 22:48:09 -0800 Created attachment 447783 Patch 1826224 5 fujii 2021-12-21 23:39:19 -0800 WinCairo EWS failed to compile. FAILED: Source/ThirdParty/ANGLE/CMakeFiles/ANGLE.dir/src/common/MemoryBuffer.cpp.obj C:\MSVS\VC\Tools\MSVC\14.28.29910\bin\Hostx64\x64\cl.exe (...) ..\..\Source\ThirdParty\ANGLE\src\common\MemoryBuffer.cpp C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1427): error C2039: 'CheckForDuplicateEntries': is not a member of 'Microsoft::WRL::Details' C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1393): note: see declaration of 'Microsoft::WRL::Details' C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1540): note: see reference to class template instantiation 'Microsoft::WRL::Module<Microsoft::WRL::InProc,ModuleT>' being compiled C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1433): error C2039: 'CheckForDuplicateEntries': is not a member of 'Microsoft::WRL::Details' C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1393): note: see declaration of 'Microsoft::WRL::Details' I don't see such error on my env. I'm using Visual Studio 2019 16.11.8. 1828019 6 fujii 2022-01-04 11:50:12 -0800 Oh, no. WinCairo EWS is still failing after updating. FAILED: Source/ThirdParty/ANGLE/CMakeFiles/ANGLE.dir/src/compiler/translator/ValidateMaxParameters.cpp.obj C:\MSVS\VC\Tools\MSVC\14.29.30133\bin\Hostx64\x64\cl.exe (...) C:\BW\WinCairo-EWS\build\Source\ThirdParty\ANGLE\src\compiler\translator\ValidateMaxParameters.cpp C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1427): error C2039: 'CheckForDuplicateEntries': is not a member of 'Microsoft::WRL::Details' C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1393): note: see declaration of 'Microsoft::WRL::Details' C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1540): note: see reference to class template instantiation 'Microsoft::WRL::Module<Microsoft::WRL::InProc,ModuleT>' being compiled C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1433): error C2039: 'CheckForDuplicateEntries': is not a member of 'Microsoft::WRL::Details' C:\Program Files (x86)\Windows Kits\10\include\10.0.17763.0\winrt\wrl\module.h(1393): note: see declaration of 'Microsoft::WRL::Details' 1828029 7 fujii 2022-01-04 12:11:52 -0800 I downgraded Windows 10 SDK to 10.0.17763.0 locally. It can reproduce the same error. 1828272 8 stephan.szabo 2022-01-05 07:39:10 -0800 It appears to have built with test image using 18362, but I need to check that the update works okay on the non-ews builder and tester. 1828440 9 448447 fujii 2022-01-05 15:56:16 -0800 Created attachment 448447 Patch 1828700 10 fujii 2022-01-06 12:00:56 -0800 Bug 233963 turned C++20 on. We no longer need to explicitly set /permissive-. Closed. I'm going to suppress the warnings in another bug: Bug 234929 – [MSVC] Suppress new warnings C5054 and C5055 introduced by /permissive- 445038 2021-11-23 09:26:30 -0800 2021-12-21 22:47:54 -0800 WIP Patch bug-233448.diff text/plain 6199 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NNYWtlTGlzdHMudHh0IGIvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvQ01ha2VMaXN0cy50eHQKaW5kZXggZDNlNDUyNGQzNzAxLi41 YTVlMGZhNGU4ZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NNYWtlTGlz dHMudHh0CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NNYWtlTGlzdHMudHh0CkBAIC0y NDksMyArMjQ5LDE1IEBAIHRhcmdldF9saW5rX2xpYnJhcmllcyhBTkdMRUZyYW1ld29yayBJTlRF UkZBQ0UgQU5HTEUpCiB0YXJnZXRfaW5jbHVkZV9kaXJlY3RvcmllcyhBTkdMRUZyYW1ld29yayBJ TlRFUkZBQ0UgJHtBTkdMRV9GUkFNRVdPUktfSEVBREVSU19ESVJ9KQogCiBhZGRfbGlicmFyeShB TkdMRTo6QU5HTEUgQUxJQVMgQU5HTEVGcmFtZXdvcmspCisKK21hY3JvKHJlbW92ZV9mbGFnX2Zy b21fdGFyZ2V0IF90YXJnZXQgX2ZsYWcpCisgICAgZ2V0X3RhcmdldF9wcm9wZXJ0eShfdGFyZ2V0 X2N4eF9mbGFncyAke190YXJnZXR9IENPTVBJTEVfT1BUSU9OUykKKyAgICBpZihfdGFyZ2V0X2N4 eF9mbGFncykKKyAgICAgICAgbGlzdChSRU1PVkVfSVRFTSBfdGFyZ2V0X2N4eF9mbGFncyAke19m bGFnfSkKKyAgICAgICAgc2V0X3RhcmdldF9wcm9wZXJ0aWVzKCR7X3RhcmdldH0gUFJPUEVSVElF UyBDT01QSUxFX09QVElPTlMgIiR7X3RhcmdldF9jeHhfZmxhZ3N9IikKKyAgICBlbmRpZigpCitl bmRtYWNybygpCisKK3JlbW92ZV9mbGFnX2Zyb21fdGFyZ2V0KEFOR0xFIC9wZXJtaXNzaXZlLSkK K3JlbW92ZV9mbGFnX2Zyb21fdGFyZ2V0KEdMRVN2MiAvcGVybWlzc2l2ZS0pCityZW1vdmVfZmxh Z19mcm9tX3RhcmdldChFR0wgL3Blcm1pc3NpdmUtKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5kbGVXaW4uY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5kbGVXaW4uY3BwCmluZGV4IGQ4 M2MzYjJhNjNiMi4uYzMyYzE2MWRhZTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3dpbi9Eb3dubG9hZEJ1bmRsZVdpbi5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay93aW4vRG93bmxvYWRCdW5kbGVXaW4uY3BwCkBAIC02Niw2ICs2 Niw3IEBAIGJvb2wgYXBwZW5kUmVzdW1lRGF0YShjb25zdCB1aW50OF90KiByZXN1bWVCeXRlcywg dWludDMyX3QgcmVzdW1lTGVuZ3RoLCBjb25zdCBTCiAgICAgfQogCiAgICAgYm9vbCByZXN1bHQg PSBmYWxzZTsKKyAgICBjb25zdCB1aW50MzJfdCBtYWdpYyA9IG1hZ2ljTnVtYmVyKCk7CiAKICAg ICBpZiAoZndyaXRlKHJlc3VtZUJ5dGVzLCAxLCByZXN1bWVMZW5ndGgsIGJ1bmRsZSkgIT0gcmVz dW1lTGVuZ3RoKSB7CiAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHdyaXRlIHJlc3VtZSBk YXRhIHRvIHRoZSBidW5kbGUgLSBlcnJubyglaSkiLCBlcnJubyk7CkBAIC03Nyw3ICs3OCw2IEBA IGJvb2wgYXBwZW5kUmVzdW1lRGF0YShjb25zdCB1aW50OF90KiByZXN1bWVCeXRlcywgdWludDMy X3QgcmVzdW1lTGVuZ3RoLCBjb25zdCBTCiAgICAgICAgIGdvdG8gZXhpdDsKICAgICB9CiAKLSAg ICBjb25zdCB1aW50MzJfdCBtYWdpYyA9IG1hZ2ljTnVtYmVyKCk7CiAgICAgaWYgKGZ3cml0ZSgm bWFnaWMsIDQsIDEsIGJ1bmRsZSkgIT0gMSkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0 byB3cml0ZSBmb290ZXIgbWFnaWMgbnVtYmVyIHRvIHRoZSBidW5kbGUgLSBlcnJubyglaSkiLCBl cnJubyk7CiAgICAgICAgIGdvdG8gZXhpdDsKQEAgLTEwNSwyMSArMTA1LDI2IEBAIGJvb2wgZXh0 cmFjdFJlc3VtZURhdGEoY29uc3QgU3RyaW5nJiBidW5kbGVQYXRoLCBWZWN0b3I8dWludDhfdD4m IHJlc3VtZURhdGEpCiAgICAgfQogCiAgICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKKyAgICBzdHJ1 Y3QgX3N0YXQ2NCBmaWxlU3RhdDsKKyAgICBmcG9zX3QgZm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlv bjsKKyAgICB1aW50MzJfdCBmb290ZXJNYWdpY051bWJlcjsKKyAgICBmcG9zX3QgZm9vdGVyTGVu Z3RoUG9zaXRpb247CisgICAgdWludDMyX3QgZm9vdGVyTGVuZ3RoOworICAgIGZwb3NfdCBmb290 ZXJTdGFydFBvc2l0aW9uOwogCiAgICAgLy8gU3RhdCB0aGUgZmlsZSB0byBnZXQgaXRzIHNpemUK LSAgICBzdHJ1Y3QgX3N0YXQ2NCBmaWxlU3RhdDsKICAgICBpZiAoX2ZzdGF0NjQoX2ZpbGVubyhi dW5kbGUpLCAmZmlsZVN0YXQpKQogICAgICAgICBnb3RvIGV4aXQ7CiAKICAgICAvLyBDaGVjayBm b3IgdGhlIGJ1bmRsZSBtYWdpYyBudW1iZXIgYXQgdGhlIGVuZCBvZiB0aGUgZmlsZQotICAgIGZw b3NfdCBmb290ZXJNYWdpY051bWJlclBvc2l0aW9uID0gZmlsZVN0YXQuc3Rfc2l6ZSAtIDQ7Cisg ICAgZm9vdGVyTWFnaWNOdW1iZXJQb3NpdGlvbiA9IGZpbGVTdGF0LnN0X3NpemUgLSA0OwogICAg IEFTU0VSVChmb290ZXJNYWdpY051bWJlclBvc2l0aW9uID49IDApOwogICAgIGlmIChmb290ZXJN YWdpY051bWJlclBvc2l0aW9uIDwgMCkKICAgICAgICAgZ290byBleGl0OwogICAgIGlmIChmc2V0 cG9zKGJ1bmRsZSwgJmZvb3Rlck1hZ2ljTnVtYmVyUG9zaXRpb24pKQogICAgICAgICBnb3RvIGV4 aXQ7CiAKLSAgICB1aW50MzJfdCBmb290ZXJNYWdpY051bWJlciA9IDA7CisgICAgZm9vdGVyTWFn aWNOdW1iZXIgPSAwOwogICAgIGlmIChmcmVhZCgmZm9vdGVyTWFnaWNOdW1iZXIsIDQsIDEsIGJ1 bmRsZSkgIT0gMSkgewogICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byByZWFkIGZvb3RlciBt YWdpYyBudW1iZXIgZnJvbSB0aGUgYnVuZGxlIC0gZXJybm8oJWkpIiwgZXJybm8pOwogICAgICAg ICBnb3RvIGV4aXQ7CkBAIC0xMzIsNyArMTM3LDcgQEAgYm9vbCBleHRyYWN0UmVzdW1lRGF0YShj b25zdCBTdHJpbmcmIGJ1bmRsZVBhdGgsIFZlY3Rvcjx1aW50OF90PiYgcmVzdW1lRGF0YSkKIAog ICAgIC8vIE5vdyB3ZSdyZSAqcmVhc29uYWJseSogc3VyZSB0aGlzIGlzIGEgLmRvd25sb2FkIGJ1 bmRsZSB3ZSBhY3R1YWxseSB3cm90ZS4KICAgICAvLyBHZXQgdGhlIGxlbmd0aCBvZiB0aGUgcmVz dW1lIGRhdGEKLSAgICBmcG9zX3QgZm9vdGVyTGVuZ3RoUG9zaXRpb24gPSBmaWxlU3RhdC5zdF9z aXplIC0gODsKKyAgICBmb290ZXJMZW5ndGhQb3NpdGlvbiA9IGZpbGVTdGF0LnN0X3NpemUgLSA4 OwogICAgIEFTU0VSVChmb290ZXJMZW5ndGhQb3NpdGlvbiA+PSAwKTsKICAgICBpZiAoZm9vdGVy TGVuZ3RoUG9zaXRpb24gPCAwKQogICAgICAgICBnb3RvIGV4aXQ7CkBAIC0xNDAsMTQgKzE0NSwx NCBAQCBib29sIGV4dHJhY3RSZXN1bWVEYXRhKGNvbnN0IFN0cmluZyYgYnVuZGxlUGF0aCwgVmVj dG9yPHVpbnQ4X3Q+JiByZXN1bWVEYXRhKQogICAgIGlmIChmc2V0cG9zKGJ1bmRsZSwgJmZvb3Rl ckxlbmd0aFBvc2l0aW9uKSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAgdWludDMyX3QgZm9v dGVyTGVuZ3RoID0gMDsKKyAgICBmb290ZXJMZW5ndGggPSAwOwogICAgIGlmIChmcmVhZCgmZm9v dGVyTGVuZ3RoLCA0LCAxLCBidW5kbGUpICE9IDEpIHsKICAgICAgICAgTE9HX0VSUk9SKCJGYWls ZWQgdG8gcmVhZCBSZXN1bWVEYXRhIGxlbmd0aCBmcm9tIHRoZSBidW5kbGUgLSBlcnJubyglaSki LCBlcnJubyk7CiAgICAgICAgIGdvdG8gZXhpdDsKICAgICB9CiAKICAgICAvLyBNYWtlIHN1cmUg dGhlcmVzIGVub3VnaCBieXRlcyB0byByZWFkIGluIGZvciB0aGUgcmVzdW1lIGRhdGEsIGFuZCBw ZXJmb3JtIHRoZSByZWFkCi0gICAgZnBvc190IGZvb3RlclN0YXJ0UG9zaXRpb24gPSBmaWxlU3Rh dC5zdF9zaXplIC0gOCAtIGZvb3Rlckxlbmd0aDsKKyAgICBmb290ZXJTdGFydFBvc2l0aW9uID0g ZmlsZVN0YXQuc3Rfc2l6ZSAtIDggLSBmb290ZXJMZW5ndGg7CiAgICAgQVNTRVJUKGZvb3RlclN0 YXJ0UG9zaXRpb24gPj0gMCk7CiAgICAgaWYgKGZvb3RlclN0YXJ0UG9zaXRpb24gPCAwKQogICAg ICAgICBnb3RvIGV4aXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4v RHJhZ0ltYWdlQ2Fpcm9XaW4uY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0RyYWdJ bWFnZUNhaXJvV2luLmNwcAppbmRleCA3OTMyNjMwNjUxY2EuLjI2YmUwM2I1ZDRmMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vd2luL0RyYWdJbWFnZUNhaXJvV2luLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vRHJhZ0ltYWdlQ2Fpcm9XaW4uY3BwCkBA IC0xMTksMTYgKzExOSwxOCBAQCBEcmFnSW1hZ2VSZWYgc2NhbGVEcmFnSW1hZ2UoRHJhZ0ltYWdl UmVmIGltYWdlUmVmLCBGbG9hdFNpemUgc2NhbGUpCiAgICAgICAgIGdvdG8gZXhpdDsKIAogICAg IEdyYXBoaWNzQ29udGV4dENhaXJvKiB0YXJnZXRDb250ZXh0OworICAgIGNhaXJvX3N1cmZhY2Vf dCogc3JjSW1hZ2U7CisgICAgY2Fpcm9fdCogY3I7CiAgICAgaGJtcCA9IGFsbG9jSW1hZ2UoZHN0 REMuZ2V0KCksIGRzdFNpemUsICZ0YXJnZXRDb250ZXh0KTsKICAgICBpZiAoIWhibXApCiAgICAg ICAgIGdvdG8gZXhpdDsKIAotICAgIGNhaXJvX3N1cmZhY2VfdCogc3JjSW1hZ2UgPSBjcmVhdGVD YWlyb0NvbnRleHRGcm9tQml0bWFwKGltYWdlLmdldCgpKTsKKyAgICBzcmNJbWFnZSA9IGNyZWF0 ZUNhaXJvQ29udGV4dEZyb21CaXRtYXAoaW1hZ2UuZ2V0KCkpOwogCiAgICAgLy8gU2NhbGUgdGhl IHRhcmdldCBzdXJmYWNlIHRvIHRoZSBuZXcgaW1hZ2Ugc2l6ZSwgYW5kIGZsaXAgaXQKICAgICAv LyBzbyB0aGF0IHdoZW4gd2Ugc2V0IHRoZSBzcmNJbWFnZSBhcyB0aGUgc3VyZmFjZSBpdCB3aWxs IGRyYXcKICAgICAvLyByaWdodC1zaWRlLXVwLgotICAgIGNhaXJvX3QqIGNyID0gdGFyZ2V0Q29u dGV4dC0+Y3IoKTsKKyAgICBjciA9IHRhcmdldENvbnRleHQtPmNyKCk7CiAgICAgY2Fpcm9fdHJh bnNsYXRlKGNyLCAwLCBkc3RTaXplLmhlaWdodCgpKTsKICAgICBjYWlyb19zY2FsZShjciwgc2Nh bGUud2lkdGgoKSwgLXNjYWxlLmhlaWdodCgpKTsKICAgICBjYWlyb19zZXRfc291cmNlX3N1cmZh Y2UoY3IsIHNyY0ltYWdlLCAwLjAsIDAuMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dmcvcHJvcGVydGllcy9TVkdQcm9wZXJ0eUFuaW1hdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcv cHJvcGVydGllcy9TVkdQcm9wZXJ0eUFuaW1hdG9yLmgKaW5kZXggODkxYTQ2Njk2MDY0Li5jZDhl MDNlYTcxMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9wcm9wZXJ0aWVzL1NWR1By b3BlcnR5QW5pbWF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvcHJvcGVydGllcy9TVkdQ cm9wZXJ0eUFuaW1hdG9yLmgKQEAgLTg5LDcgKzg5LDcgQEAgcHJvdGVjdGVkOgogCiAgICAgU3Ry aW5nIGNvbXB1dGVJbmhlcml0ZWRDU1NQcm9wZXJ0eVZhbHVlKFNWR0VsZW1lbnQmIHRhcmdldEVs ZW1lbnQpIGNvbnN0CiAgICAgewotICAgICAgICBSZWZQdHIgcGFyZW50ID0gdGFyZ2V0RWxlbWVu dC5wYXJlbnRFbGVtZW50KCk7CisgICAgICAgIFJlZlB0cjxFbGVtZW50PiBwYXJlbnQgPSB0YXJn ZXRFbGVtZW50LnBhcmVudEVsZW1lbnQoKTsKICAgICAgICAgaWYgKCFwYXJlbnQgfHwgIXBhcmVu dC0+aXNTVkdFbGVtZW50KCkpCiAgICAgICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKICAg ICAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UgYi9Tb3Vy Y2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UKaW5kZXggNWUxZGYxOTc2Mjk3Li4yYzNkNzRlMDZk ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9jbWFrZS9PcHRpb25zTVNWQy5jbWFrZQorKysgYi9Tb3Vy Y2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UKQEAgLTIwOSw0ICsyMDksNSBAQCBlbmRpZiAoKQog IyBFbmFibGUgdGhlIG5ldyBsYW1iZGEgcHJvY2Vzc29yIGZvciBiZXR0ZXIgQysrIGNvbmZvcm1h bmNlCiBpZiAoTk9UIENPTVBJTEVSX0lTX0NMQU5HX0NMIEFORCBNU1ZDX1ZFUlNJT04gR1JFQVRF Ul9FUVVBTCAxOTI4KQogICAgIGFkZF9jb21waWxlX29wdGlvbnMoL1pjOmxhbWJkYSkKKyAgICBh ZGRfY29tcGlsZV9vcHRpb25zKC9wZXJtaXNzaXZlLSkKIGVuZGlmICgpCg== 447783 2021-12-21 22:48:09 -0800 2022-01-05 15:56:05 -0800 Patch bug-233448-20211222154807.patch text/plain 1875 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MzMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc01TVkMuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UKaW5kZXggNWUx ZGYxOTc2Mjk3MjY1MWMxNTgxYTQ3ZDdkMjE2Y2FjNjk4YjU3Yi4uYzZkNDA1MTJlYjkxMjc4OWM5 ZGZiNzhkZTZmMjE2OTViYmUzYTFlNCAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNN U1ZDLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zTVNWQy5jbWFrZQpAQCAtMTAyLDYg KzEwMiwxMCBAQCBhZGRfY29tcGlsZV9vcHRpb25zKAogCiAgICAgL3dkNDk5NiAjIFlvdXIgY29k ZSB1c2VzIGEgZnVuY3Rpb24sIGNsYXNzIG1lbWJlciwgdmFyaWFibGUsIG9yIHR5cGVkZWYgdGhh dCdzIG1hcmtlZCBkZXByZWNhdGVkCiAKKyAgICAvd2Q1MDU0ICMgb3BlcmF0b3IgJ29wZXJhdG9y LW5hbWUnOiBkZXByZWNhdGVkIGJldHdlZW4gZW51bWVyYXRpb25zIG9mIGRpZmZlcmVudCB0eXBl cworCisgICAgL3dkNTA1NSAjIG9wZXJhdG9yICdvcGVyYXRvci1uYW1lJzogZGVwcmVjYXRlZCBi ZXR3ZWVuIGVudW1lcmF0aW9ucyBhbmQgZmxvYXRpbmctcG9pbnQgdHlwZXMKKwogICAgIC93ZDUy MDUgIyBkZWxldGUgb2YgYW4gYWJzdHJhY3QgY2xhc3MgJ3R5cGUtbmFtZScgdGhhdCBoYXMgYSBu b24tdmlydHVhbCBkZXN0cnVjdG9yIHJlc3VsdHMgaW4gdW5kZWZpbmVkIGJlaGF2aW9yCiApCiAK QEAgLTIwOSw0ICsyMTMsNSBAQCBlbmRpZiAoKQogIyBFbmFibGUgdGhlIG5ldyBsYW1iZGEgcHJv Y2Vzc29yIGZvciBiZXR0ZXIgQysrIGNvbmZvcm1hbmNlCiBpZiAoTk9UIENPTVBJTEVSX0lTX0NM QU5HX0NMIEFORCBNU1ZDX1ZFUlNJT04gR1JFQVRFUl9FUVVBTCAxOTI4KQogICAgIGFkZF9jb21w aWxlX29wdGlvbnMoL1pjOmxhbWJkYSkKKyAgICBhZGRfY29tcGlsZV9vcHRpb25zKC9wZXJtaXNz aXZlLSkKIGVuZGlmICgpCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VMb2cKaW5kZXgg ODkyM2QyMTNjMzQ3ZGNjY2FjZWFmMzAwYjlmY2U1OWY3YjdhYzM4Ni4uZTk3YjQ5YmViYWZlNTE2 YjZmNGIxOTUxNWYyMjg1MWUxOTE1YzY5YSAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBiL0No YW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTEyLTIxICBGdWppaSBIaXJvbm9yaSAgPEhp cm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtDTWFrZV1bTVNWQ10gQ29tcGlsZSB3 aXRoIC9wZXJtaXNzaXZlLQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMzNDQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTVNWQyAvc3RkOmMrKzIwIG9wdGlvbiBpbXBsaWNpdGx5IGVuYWJsZXMgL3Blcm1p c3NpdmUtIG9wdGlvbi4gVGhlCisgICAgICAgIGNvbXBpbGF0aW9uIGVycm9ycyBjYXVzZWQgYnkg L3Blcm1pc3NpdmUtIG9wdGlvbiBoYWQgYmVlbiByZXNvbHZlZAorICAgICAgICBieSBwcmVjZWRp bmcgcGF0Y2hlcy4gTGV0J3MgZW5hYmxlIHRoZSBzdGFuZGFyZHMgY29uZm9ybWFuY2UgbW9kZQor ICAgICAgICBvZiBNU1ZDIG5vdyBmb3IgdXBjb21taW5nIC9zdGQ6YysrMjAgb3B0aW9uLgorCisg ICAgICAgICogU291cmNlL2NtYWtlL09wdGlvbnNNU1ZDLmNtYWtlOiBBZGRlZCAvcGVybWlzc2l2 ZS0gb3B0aW9uLgorICAgICAgICBTdXBwcmVzcyBuZXcgd2FybmluZ3MuCisKIDIwMjEtMTItMTUg IENocmlzIExvcmQgIDxjbG9yZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFVzZSBsaWJn Ym0gYW5kIHRoZSBBTkdMRSBnYm0gYmFja2VuZCB0byBmaXggaW5pdGlhbGlzYXRpb24K 448447 2022-01-05 15:56:16 -0800 2022-01-06 11:51:25 -0800 Patch bug-233448-20220106085615.patch text/plain 1813 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvY21ha2UvT3B0 aW9uc01TVkMuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2UKaW5kZXggZmJj YjEwMDU2ZDVhMWYzNzc4MjIxNjg1MzYxODE5Yzk4NTJjYzhhZi4uN2JhMjBjYTc1YjA0ODJmZDJj OWZiMWE2ZTE0NDIxYmMwNmQyZDg1MiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNN U1ZDLmNtYWtlCisrKyBiL1NvdXJjZS9jbWFrZS9PcHRpb25zTVNWQy5jbWFrZQpAQCAtMTAyLDYg KzEwMiwxMCBAQCBhZGRfY29tcGlsZV9vcHRpb25zKAogCiAgICAgL3dkNDk5NiAjIFlvdXIgY29k ZSB1c2VzIGEgZnVuY3Rpb24sIGNsYXNzIG1lbWJlciwgdmFyaWFibGUsIG9yIHR5cGVkZWYgdGhh dCdzIG1hcmtlZCBkZXByZWNhdGVkCiAKKyAgICAvd2Q1MDU0ICMgb3BlcmF0b3IgJ29wZXJhdG9y LW5hbWUnOiBkZXByZWNhdGVkIGJldHdlZW4gZW51bWVyYXRpb25zIG9mIGRpZmZlcmVudCB0eXBl cworCisgICAgL3dkNTA1NSAjIG9wZXJhdG9yICdvcGVyYXRvci1uYW1lJzogZGVwcmVjYXRlZCBi ZXR3ZWVuIGVudW1lcmF0aW9ucyBhbmQgZmxvYXRpbmctcG9pbnQgdHlwZXMKKwogICAgIC93ZDUy MDUgIyBkZWxldGUgb2YgYW4gYWJzdHJhY3QgY2xhc3MgJ3R5cGUtbmFtZScgdGhhdCBoYXMgYSBu b24tdmlydHVhbCBkZXN0cnVjdG9yIHJlc3VsdHMgaW4gdW5kZWZpbmVkIGJlaGF2aW9yCiApCiAK QEAgLTIxMiwzICsyMTYsNSBAQCBlbmRpZiAoKQogaWYgKE5PVCBDT01QSUxFUl9JU19DTEFOR19D TCBBTkQgTVNWQ19WRVJTSU9OIEdSRUFURVJfRVFVQUwgMTkyOCkKICAgICBhZGRfY29tcGlsZV9v cHRpb25zKC9aYzpsYW1iZGEpCiBlbmRpZiAoKQorCithZGRfY29tcGlsZV9vcHRpb25zKC9wZXJt aXNzaXZlLSkKZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCAwNGY4ZDli YzMyZDNlMzM0NWU5YWE4ZTA5M2I4YWRlN2U0ZjM0MWFiLi5lYmQ5ZmRmZDgwMGE0MjI4NWRjNTdi MTdlZjliMDhhNTcyNzg1NWFiIDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTggQEAKKzIwMjItMDEtMDUgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmku RnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW0NNYWtlXVtNU1ZDXSBDb21waWxlIHdpdGggL3Bl cm1pc3NpdmUtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzM0NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNU1ZDIC9zdGQ6YysrMjAgb3B0aW9uIGltcGxpY2l0bHkgZW5hYmxlcyAvcGVybWlzc2l2ZS0g b3B0aW9uLiBUaGUKKyAgICAgICAgY29tcGlsYXRpb24gZXJyb3JzIGNhdXNlZCBieSAvcGVybWlz c2l2ZS0gb3B0aW9uIGhhZCBiZWVuIHJlc29sdmVkCisgICAgICAgIGJ5IHByZWNlZGluZyBwYXRj aGVzLiBMZXQncyBlbmFibGUgdGhlIHN0YW5kYXJkcyBjb25mb3JtYW5jZSBtb2RlCisgICAgICAg IG9mIE1TVkMgbm93IGZvciB1cGNvbW1pbmcgL3N0ZDpjKysyMCBvcHRpb24uCisKKyAgICAgICAg KiBTb3VyY2UvY21ha2UvT3B0aW9uc01TVkMuY21ha2U6IEFkZGVkIC9wZXJtaXNzaXZlLSBvcHRp b24uCisgICAgICAgIFN1cHByZXNzIG5ldyB3YXJuaW5ncy4KKwogMjAyMi0wMS0wNCAgRnVqaWkg SGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KIAogICAgICAgICBjbGFuZy1mb3Jt YXQ6IENoYW5nZSBTcGFjZUFmdGVyVGVtcGxhdGVLZXl3b3JkIHRvIGZhbHNlCg==