237647 2022-03-09 04:03:36 -0800 [WinCairo] SpatialNavigation.h(93): error C2365: 'WebCore::None': redefinition; previous definition was 'enumerator' 2022-03-09 05:31:16 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 fujii fujii webkit-bug-importer oldest_to_newest 1849618 0 fujii 2022-03-09 04:03:36 -0800 [WinCairo] SpatialNavigation.h(93): error C2365: 'WebCore::None': redefinition; previous definition was 'enumerator' https://build.webkit.org/#/builders/38/builds/12550 C:\BW\wincairo-wkl-debug\build\Source\WebCore\page\SpatialNavigation.h(93): error C2365: 'WebCore::None': redefinition; previous definition was 'enumerator' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page\ResourceUsageThread.h(51): note: see declaration of 'WebCore::None' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page\SpatialNavigation.h(104): error C2440: 'initializing': cannot convert from 'WebCore::ResourceUsageCollectionMode' to 'WebCore::RectsAlignment' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page\SpatialNavigation.h(104): note: Conversion to enumeration type requires an explicit cast (static_cast, C-style cast or function-style cast) C:\BW\wincairo-wkl-debug\build\Source\WebCore\page\SpatialNavigation.h(107): error C2439: 'WebCore::FocusCandidate::alignment': member could not be initialized C:\BW\wincairo-wkl-debug\build\Source\WebCore\page\SpatialNavigation.h(124): note: see declaration of 'WebCore::FocusCandidate::alignment' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(63): error C2440: 'initializing': cannot convert from 'WebCore::ResourceUsageCollectionMode' to 'WebCore::RectsAlignment' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(63): note: Conversion to enumeration type requires an explicit cast (static_cast, C-style cast or function-style cast) C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(66): error C2439: 'WebCore::FocusCandidate::alignment': member could not be initialized C:\BW\wincairo-wkl-debug\build\Source\WebCore\page\SpatialNavigation.h(124): note: see declaration of 'WebCore::FocusCandidate::alignment' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(99): error C2440: 'return': cannot convert from 'WebCore::ResourceUsageCollectionMode' to 'WebCore::RectsAlignment' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(99): note: Conversion to enumeration type requires an explicit cast (static_cast, C-style cast or function-style cast) C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(107): error C2440: 'return': cannot convert from 'WebCore::ResourceUsageCollectionMode' to 'WebCore::RectsAlignment' C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(107): note: Conversion to enumeration type requires an explicit cast (static_cast, C-style cast or function-style cast) C:\BW\wincairo-wkl-debug\build\Source\WebCore\page/SpatialNavigation.cpp(98): warning C4390: ';': empty controlled statement found; is this the intent? 1849626 1 454227 fujii 2022-03-09 04:18:59 -0800 Created attachment 454227 Patch 1849654 2 ews-feeder 2022-03-09 05:30:29 -0800 Committed r291044 (248218@main): <https://commits.webkit.org/248218@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454227. 1849655 3 webkit-bug-importer 2022-03-09 05:31:16 -0800 <rdar://problem/90026481> 454227 2022-03-09 04:18:59 -0800 2022-03-09 05:30:31 -0800 Patch bug-237647-20220309211858.patch text/plain 4494 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjRjZGFmNDQzOWQyYTQ0 M2RkODFiMTRjNmUwYTBjNzY2YzA0YTJiNC4uNGVmOTQzOGJiMjM4MWFjNGFhMzJlYjI3NjY1MjBj NmI5N2UzOGE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIyLTAzLTA5ICBGdWpp aSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgorCisgICAgICAgIFtXaW5DYWly b10gU3BhdGlhbE5hdmlnYXRpb24uaCg5Myk6IGVycm9yIEMyMzY1OiAnV2ViQ29yZTo6Tm9uZSc6 IHJlZGVmaW5pdGlvbjsgcHJldmlvdXMgZGVmaW5pdGlvbiB3YXMgJ2VudW1lcmF0b3InCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc2NDcKKworICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KKworICAgICAgICBDaGFuZ2VkIFdlYkNvcmU6OlJl Y3RzQWxpZ25tZW50IHRvIGFuIGVudW0gY2xhc3MuCisKKyAgICAgICAgKiBwYWdlL0ZvY3VzQ29u dHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjp1cGRhdGVGb2N1c0NhbmRpZGF0ZUlmTmVl ZGVkKToKKyAgICAgICAgKiBwYWdlL1NwYXRpYWxOYXZpZ2F0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkZvY3VzQ2FuZGlkYXRlOjpGb2N1c0NhbmRpZGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjphbGlnbm1lbnRGb3JSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpkaXN0YW5jZURhdGFGb3JO b2RlKToKKyAgICAgICAgKiBwYWdlL1NwYXRpYWxOYXZpZ2F0aW9uLmg6CisgICAgICAgIChXZWJD b3JlOjpGb2N1c0NhbmRpZGF0ZTo6Rm9jdXNDYW5kaWRhdGUpOgorICAgICAgICAoKTogRGVsZXRl ZC4KKwogMjAyMi0wMy0wOSAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgog CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dEdMQ29jb2EgbWFuYWdlcyBFR0wgbmF0aXZlIGRpc3Bs YXlzIG1hbnVhbGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5jcHAKaW5kZXgg ZDVhYzkxMTNmZTZiZDRhZjVjNDM1MmJlN2JlZjEyNGQ5ZmYyYTA1ZC4uYzU5ZDJhMjM0YzQ1ZWE4 NTRkZGYwNmE5MTJmYTFiY2M3M2I4N2Y3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250 cm9sbGVyLmNwcApAQCAtOTcyLDcgKzk3Miw3IEBAIHN0YXRpYyB2b2lkIHVwZGF0ZUZvY3VzQ2Fu ZGlkYXRlSWZOZWVkZWQoRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBjb25zdCBGb2N1c0NhCiAg ICAgaWYgKGNhbmRpZGF0ZS5kaXN0YW5jZSA9PSBtYXhEaXN0YW5jZSgpKQogICAgICAgICByZXR1 cm47CiAKLSAgICBpZiAoY2FuZGlkYXRlLmlzT2Zmc2NyZWVuQWZ0ZXJTY3JvbGxpbmcgJiYgY2Fu ZGlkYXRlLmFsaWdubWVudCA8IEZ1bGwpCisgICAgaWYgKGNhbmRpZGF0ZS5pc09mZnNjcmVlbkFm dGVyU2Nyb2xsaW5nICYmIGNhbmRpZGF0ZS5hbGlnbm1lbnQgPCBSZWN0c0FsaWdubWVudDo6RnVs bCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKGNsb3Nlc3QuaXNOdWxsKCkpIHsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU3BhdGlhbE5hdmlnYXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHAKaW5kZXggM2U1OWVkMjY3MWZjYzVj MGE3OGVlODhmODAyMjRiNDI3MzAyMjI2OS4uZTJlMWNhOWY0YjM2NTBiNzViN2U2NmNmMGYxOWU5 NTdmZGZmYzYxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdh dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5jcHAK QEAgLTYwLDcgKzYwLDcgQEAgRm9jdXNDYW5kaWRhdGU6OkZvY3VzQ2FuZGlkYXRlKE5vZGUqIG5v ZGUsIEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbikKICAgICAsIGZvY3VzYWJsZU5vZGUobnVsbHB0 cikKICAgICAsIGVuY2xvc2luZ1Njcm9sbGFibGVCb3gobnVsbHB0cikKICAgICAsIGRpc3RhbmNl KG1heERpc3RhbmNlKCkpCi0gICAgLCBhbGlnbm1lbnQoTm9uZSkKKyAgICAsIGFsaWdubWVudChS ZWN0c0FsaWdubWVudDo6Tm9uZSkKICAgICAsIGlzT2Zmc2NyZWVuKHRydWUpCiAgICAgLCBpc09m ZnNjcmVlbkFmdGVyU2Nyb2xsaW5nKHRydWUpCiB7CkBAIC05NiwxNSArOTYsMTUgQEAgc3RhdGlj IFJlY3RzQWxpZ25tZW50IGFsaWdubWVudEZvclJlY3RzKEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlv biwgY29uc3QgTGF5b3V0UmUKIHsKICAgICAvLyBJZiB3ZSBmb3VuZCBhIG5vZGUgaW4gZnVsbCBh bGlnbm1lbnQsIGJ1dCBpdCBpcyB0b28gZmFyIGF3YXksIGlnbm9yZSBpdC4KICAgICBpZiAoYXJl UmVjdHNNb3JlVGhhbkZ1bGxTY3JlZW5BcGFydChkaXJlY3Rpb24sIGN1clJlY3QsIHRhcmdldFJl Y3QsIHZpZXdTaXplKSkKLSAgICAgICAgcmV0dXJuIE5vbmU7CisgICAgICAgIHJldHVybiBSZWN0 c0FsaWdubWVudDo6Tm9uZTsKIAogICAgIGlmIChhcmVSZWN0c0Z1bGx5QWxpZ25lZChkaXJlY3Rp b24sIGN1clJlY3QsIHRhcmdldFJlY3QpKQotICAgICAgICByZXR1cm4gRnVsbDsKKyAgICAgICAg cmV0dXJuIFJlY3RzQWxpZ25tZW50OjpGdWxsOwogCiAgICAgaWYgKGFyZVJlY3RzUGFydGlhbGx5 QWxpZ25lZChkaXJlY3Rpb24sIGN1clJlY3QsIHRhcmdldFJlY3QpKQotICAgICAgICByZXR1cm4g UGFydGlhbDsKKyAgICAgICAgcmV0dXJuIFJlY3RzQWxpZ25tZW50OjpQYXJ0aWFsOwogCi0gICAg cmV0dXJuIE5vbmU7CisgICAgcmV0dXJuIFJlY3RzQWxpZ25tZW50OjpOb25lOwogfQogCiBzdGF0 aWMgaW5saW5lIGJvb2wgaXNIb3Jpem9udGFsTW92ZShGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24p CkBAIC02NDgsNyArNjQ4LDcgQEAgdm9pZCBkaXN0YW5jZURhdGFGb3JOb2RlKEZvY3VzRGlyZWN0 aW9uIGRpcmVjdGlvbiwgY29uc3QgRm9jdXNDYW5kaWRhdGUmIGN1cnJlbnQKICAgICBpZiAoYXJl RWxlbWVudHNPblNhbWVMaW5lKGN1cnJlbnQsIGNhbmRpZGF0ZSkpIHsKICAgICAgICAgaWYgKChk aXJlY3Rpb24gPT0gRm9jdXNEaXJlY3Rpb246OlVwICYmIGN1cnJlbnQucmVjdC55KCkgPiBjYW5k aWRhdGUucmVjdC55KCkpIHx8IChkaXJlY3Rpb24gPT0gRm9jdXNEaXJlY3Rpb246OkRvd24gJiYg Y2FuZGlkYXRlLnJlY3QueSgpID4gY3VycmVudC5yZWN0LnkoKSkpIHsKICAgICAgICAgICAgIGNh bmRpZGF0ZS5kaXN0YW5jZSA9IDA7Ci0gICAgICAgICAgICBjYW5kaWRhdGUuYWxpZ25tZW50ID0g RnVsbDsKKyAgICAgICAgICAgIGNhbmRpZGF0ZS5hbGlnbm1lbnQgPSBSZWN0c0FsaWdubWVudDo6 RnVsbDsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU3BhdGlhbE5hdmlnYXRpb24uaCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvU3BhdGlhbE5hdmlnYXRpb24uaAppbmRleCA5NzQ4Njg2M2UwNTc3N2I5ZDBkMzMyNmFk MmZlZDZjYzY4YjZjMjA3Li45YzdhN2Q4YzgzY2JjODA1Y2MyOGZjOTllMGQ2NDE1NTM1ZjcyMjBm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NwYXRpYWxOYXZpZ2F0aW9uLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9TcGF0aWFsTmF2aWdhdGlvbi5oCkBAIC04OSw3ICs4OSw3 IEBAIGJvb2wgaXNTcGF0aWFsTmF2aWdhdGlvbkVuYWJsZWQoY29uc3QgRnJhbWUqKTsKIC8vICJU b3RhbGx5IEFsaWduZWQiIGVsZW1lbnRzIGFyZSBwcmVmZXJhYmxlIGNhbmRpZGF0ZXMgdG8gbW92 ZQogLy8gZm9jdXMgdG8gb3ZlciAiUGFydGlhbGx5IEFsaWduZWQiIG9uZXMsIHRoYXQgb24gaXRz IHR1cm5zIGFyZQogLy8gbW9yZSBwcmVmZXJhYmxlIHRoYW4gIk5vdCBBbGlnbmVkIi4KLWVudW0g UmVjdHNBbGlnbm1lbnQgeworZW51bSBjbGFzcyBSZWN0c0FsaWdubWVudCB7CiAgICAgTm9uZSA9 IDAsCiAgICAgUGFydGlhbCwKICAgICBGdWxsCkBAIC0xMDEsNyArMTAxLDcgQEAgc3RydWN0IEZv Y3VzQ2FuZGlkYXRlIHsKICAgICAgICAgLCBmb2N1c2FibGVOb2RlKG51bGxwdHIpCiAgICAgICAg ICwgZW5jbG9zaW5nU2Nyb2xsYWJsZUJveChudWxscHRyKQogICAgICAgICAsIGRpc3RhbmNlKG1h eERpc3RhbmNlKCkpCi0gICAgICAgICwgYWxpZ25tZW50KE5vbmUpCisgICAgICAgICwgYWxpZ25t ZW50KFJlY3RzQWxpZ25tZW50OjpOb25lKQogICAgICAgICAsIGlzT2Zmc2NyZWVuKHRydWUpCiAg ICAgICAgICwgaXNPZmZzY3JlZW5BZnRlclNjcm9sbGluZyh0cnVlKQogICAgIHsK