225887 2021-05-17 14:26:50 -0700 Clean up code distinguishing between webgl/webgl2 contexts 2021-05-18 10:33:20 -0700 1 1 1 Unclassified WebKit WebGL WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222758 1 kbr kbr cdumez changseok darin dino esprehn+autocc ews-watchlist gyuyoung.kim kbr kkinnunen webkit-bug-importer oldest_to_newest 1760887 0 kbr 2021-05-17 14:26:50 -0700 Per review on Bug 222758 - the code recently added to properly distinguish between WebGL 1.0 and 2.0 contexts should be cleaned up. 1760889 1 428870 kbr 2021-05-17 14:29:31 -0700 Created attachment 428870 Patch 1761018 2 kbr 2021-05-17 20:23:52 -0700 FYI, the test failures/flakes are not related to this patch. 1761042 3 428870 darin 2021-05-17 23:05:36 -0700 Comment on attachment 428870 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428870&action=review > Source/WebCore/html/HTMLCanvasElement.cpp:263 > + if ((version == WebGLVersion::WebGL1) != (m_context->isWebGL1())) Extra set of parentheses here that you did not add below. 1761185 4 428948 kbr 2021-05-18 09:33:47 -0700 Created attachment 428948 Patch 1761186 5 kbr 2021-05-18 09:34:09 -0700 Thanks for your review Darin. Fixed, CQ'ing. 1761201 6 ews-feeder 2021-05-18 10:32:30 -0700 Committed r277659 (237864@main): <https://commits.webkit.org/237864@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428948. 1761203 7 webkit-bug-importer 2021-05-18 10:33:20 -0700 <rdar://problem/78162049> 428870 2021-05-17 14:29:31 -0700 2021-05-18 09:33:45 -0700 Patch bug-225887-20210517142931.patch text/plain 2511 kbr U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4ZmY5OGY3MjM1MWYx NWJmNTMzYmJhM2Y2MmJjYzFjZTYwYjVkYS4uMWZkMTJmZmM5MzNkYzNjZDY3ODA3NmEyZDFjOTQ3 MDQ4YzZkYzY1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA1LTE3ICBLZW5u ZXRoIFJ1c3NlbGwgIDxrYnJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENsZWFuIHVwIGNvZGUg ZGlzdGluZ3Vpc2hpbmcgYmV0d2VlbiB3ZWJnbC93ZWJnbDIgY29udGV4dHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTg4NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZHJlc3MgY29kZSByZXZpZXcg ZmVlZGJhY2sgb24gZWFybGllciBidWcuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyBX ZWJHTCBjb25mb3JtYW5jZSB0ZXN0cy4KKworICAgICAgICAqIGh0bWwvSFRNTENhbnZhc0VsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHQp OgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHRXZWJHTCk6 CisKIDIwMjEtMDUtMTQgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgQWRkIFNjcmlwdERpc2FsbG93ZWRTY29wZSB0byBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5k YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKaW5kZXggYTk1 OGJiMDY5NThhMzkwMjVkN2JjZDZmZmYxYWNkNDdjMmRiMTZjYi4uMjgzYjNmNTFlMWY2ZGNiZTRk N2JkZDA4Y2VmNDVkMmMxNDg0MDdkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MQ2FudmFzRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFz RWxlbWVudC5jcHAKQEAgLTI2MCw5ICsyNjAsNyBAQCBFeGNlcHRpb25PcjxPcHRpb25hbDxSZW5k ZXJpbmdDb250ZXh0Pj4gSFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHQoSlNDOjpKU0dsbwog ICAgICAgICAgICAgaWYgKCFpc1dlYkdMVHlwZShjb250ZXh0SWQpKQogICAgICAgICAgICAgICAg IHJldHVybiBPcHRpb25hbDxSZW5kZXJpbmdDb250ZXh0PiB7IFdURjo6bnVsbG9wdCB9OwogICAg ICAgICAgICAgYXV0byB2ZXJzaW9uID0gdG9XZWJHTFZlcnNpb24oY29udGV4dElkKTsKLSAgICAg ICAgICAgIGlmICh2ZXJzaW9uID09IFdlYkdMVmVyc2lvbjo6V2ViR0wxICYmICFtX2NvbnRleHQt PmlzV2ViR0wxKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIE9wdGlvbmFsPFJlbmRlcmluZ0Nv bnRleHQ+IHsgV1RGOjpudWxsb3B0IH07Ci0gICAgICAgICAgICBpZiAodmVyc2lvbiAhPSBXZWJH TFZlcnNpb246OldlYkdMMSAmJiBtX2NvbnRleHQtPmlzV2ViR0wxKCkpCisgICAgICAgICAgICBp ZiAoKHZlcnNpb24gPT0gV2ViR0xWZXJzaW9uOjpXZWJHTDEpICE9IChtX2NvbnRleHQtPmlzV2Vi R0wxKCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBPcHRpb25hbDxSZW5kZXJpbmdDb250ZXh0 PiB7IFdURjo6bnVsbG9wdCB9OwogICAgICAgICAgICAgaWYgKGlzPFdlYkdMUmVuZGVyaW5nQ29u dGV4dD4oKm1fY29udGV4dCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIE9wdGlvbmFsPFJlbmRl cmluZ0NvbnRleHQ+IHsgUmVmUHRyPFdlYkdMUmVuZGVyaW5nQ29udGV4dD4geyAmZG93bmNhc3Q8 V2ViR0xSZW5kZXJpbmdDb250ZXh0PigqbV9jb250ZXh0KSB9IH07CkBAIC00ODcsMTEgKzQ4NSw3 IEBAIFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2UqIEhUTUxDYW52YXNFbGVtZW50OjpnZXRDb250 ZXh0V2ViR0woV2ViR0xWZXJzaW9uIHR5cGUsCiAgICAgICAgIGlmICghbV9jb250ZXh0LT5pc1dl YkdMKCkpCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgICAgICAvLyBUaGUgcGhy YXNpbmcgb2YgdGhlc2UgY2hlY2tzIGF2b2lkcyBjb21waWxlLXRpbWUgZ3VhcmRzIGZvciBXZWJH TDIgc3VwcG9ydC4KLSAgICAgICAgaWYgKHR5cGUgPT0gV2ViR0xWZXJzaW9uOjpXZWJHTDEgJiYg IW1fY29udGV4dC0+aXNXZWJHTDEoKSkKLSAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotCi0g ICAgICAgIGlmICh0eXBlICE9IFdlYkdMVmVyc2lvbjo6V2ViR0wxICYmIG1fY29udGV4dC0+aXNX ZWJHTDEoKSkKKyAgICAgICAgaWYgKCh0eXBlID09IFdlYkdMVmVyc2lvbjo6V2ViR0wxKSAhPSBt X2NvbnRleHQtPmlzV2ViR0wxKCkpCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9 CiAK 428948 2021-05-18 09:33:47 -0700 2021-05-18 10:32:32 -0700 Patch bug-225887-20210518093346.patch text/plain 2506 kbr U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzg4ZmY5OGY3MjM1MWYx NWJmNTMzYmJhM2Y2MmJjYzFjZTYwYjVkYS4uZjY1YmIwMjU5MTAxMGUwYWIxMjRkYjk2Zjk5MDcy YTc4ZWU0MTM0NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA1LTE3ICBLZW5u ZXRoIFJ1c3NlbGwgIDxrYnJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENsZWFuIHVwIGNvZGUg ZGlzdGluZ3Vpc2hpbmcgYmV0d2VlbiB3ZWJnbC93ZWJnbDIgY29udGV4dHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTg4NworCisgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIEFkZHJlc3MgY29kZSByZXZpZXcgZmVl ZGJhY2sgb24gZWFybGllciBidWcuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyBXZWJH TCBjb25mb3JtYW5jZSB0ZXN0cy4KKworICAgICAgICAqIGh0bWwvSFRNTENhbnZhc0VsZW1lbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHRXZWJHTCk6CisK IDIwMjEtMDUtMTQgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAg QWRkIFNjcmlwdERpc2FsbG93ZWRTY29wZSB0byBNZWRpYVBsYXllclByaXZhdGVBVkZvdW5kYXRp b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKaW5kZXggYTk1OGJi MDY5NThhMzkwMjVkN2JjZDZmZmYxYWNkNDdjMmRiMTZjYi4uYmE1ZDY3ZGU4NjEwOWUyYmI4MmUy YTA0OTJiMWY0MzI0MWU0YmU4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M Q2FudmFzRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxl bWVudC5jcHAKQEAgLTI2MCw5ICsyNjAsNyBAQCBFeGNlcHRpb25PcjxPcHRpb25hbDxSZW5kZXJp bmdDb250ZXh0Pj4gSFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHQoSlNDOjpKU0dsbwogICAg ICAgICAgICAgaWYgKCFpc1dlYkdMVHlwZShjb250ZXh0SWQpKQogICAgICAgICAgICAgICAgIHJl dHVybiBPcHRpb25hbDxSZW5kZXJpbmdDb250ZXh0PiB7IFdURjo6bnVsbG9wdCB9OwogICAgICAg ICAgICAgYXV0byB2ZXJzaW9uID0gdG9XZWJHTFZlcnNpb24oY29udGV4dElkKTsKLSAgICAgICAg ICAgIGlmICh2ZXJzaW9uID09IFdlYkdMVmVyc2lvbjo6V2ViR0wxICYmICFtX2NvbnRleHQtPmlz V2ViR0wxKCkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIE9wdGlvbmFsPFJlbmRlcmluZ0NvbnRl eHQ+IHsgV1RGOjpudWxsb3B0IH07Ci0gICAgICAgICAgICBpZiAodmVyc2lvbiAhPSBXZWJHTFZl cnNpb246OldlYkdMMSAmJiBtX2NvbnRleHQtPmlzV2ViR0wxKCkpCisgICAgICAgICAgICBpZiAo KHZlcnNpb24gPT0gV2ViR0xWZXJzaW9uOjpXZWJHTDEpICE9IG1fY29udGV4dC0+aXNXZWJHTDEo KSkKICAgICAgICAgICAgICAgICByZXR1cm4gT3B0aW9uYWw8UmVuZGVyaW5nQ29udGV4dD4geyBX VEY6Om51bGxvcHQgfTsKICAgICAgICAgICAgIGlmIChpczxXZWJHTFJlbmRlcmluZ0NvbnRleHQ+ KCptX2NvbnRleHQpKQogICAgICAgICAgICAgICAgIHJldHVybiBPcHRpb25hbDxSZW5kZXJpbmdD b250ZXh0PiB7IFJlZlB0cjxXZWJHTFJlbmRlcmluZ0NvbnRleHQ+IHsgJmRvd25jYXN0PFdlYkdM UmVuZGVyaW5nQ29udGV4dD4oKm1fY29udGV4dCkgfSB9OwpAQCAtNDg3LDExICs0ODUsNyBAQCBX ZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlKiBIVE1MQ2FudmFzRWxlbWVudDo6Z2V0Q29udGV4dFdl YkdMKFdlYkdMVmVyc2lvbiB0eXBlLAogICAgICAgICBpZiAoIW1fY29udGV4dC0+aXNXZWJHTCgp KQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICAgICAgLy8gVGhlIHBocmFzaW5n IG9mIHRoZXNlIGNoZWNrcyBhdm9pZHMgY29tcGlsZS10aW1lIGd1YXJkcyBmb3IgV2ViR0wyIHN1 cHBvcnQuCi0gICAgICAgIGlmICh0eXBlID09IFdlYkdMVmVyc2lvbjo6V2ViR0wxICYmICFtX2Nv bnRleHQtPmlzV2ViR0wxKCkpCi0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQotICAgICAg ICBpZiAodHlwZSAhPSBXZWJHTFZlcnNpb246OldlYkdMMSAmJiBtX2NvbnRleHQtPmlzV2ViR0wx KCkpCisgICAgICAgIGlmICgodHlwZSA9PSBXZWJHTFZlcnNpb246OldlYkdMMSkgIT0gbV9jb250 ZXh0LT5pc1dlYkdMMSgpKQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCg==