Revert "Auto merge of #18114 - emilio:revert-webgl-refactor, r=nox" …
This reverts commit 4d10d39, reversing changes made to ee94e2b.
