Commit aca0e34a authored by Jeff Gilbert's avatar Jeff Gilbert
Browse files

Bug 1627667 - Don't use nullptr with std::string. r=lsalzman, a=jcristau 

Differential Revision: https://phabricator.services.mozilla.com/D88357
parent 95d534a1

dom/canvas/WebGLContext.cpp

+9 −2
Original line number Diff line number Diff line
@@ -1904,17 +1904,24 @@ Maybe<std::string> WebGLContext::GetString(const GLenum pname) const { 
  const WebGLContext::FuncScope funcScope(*this, "getParameter");

  if (IsContextLost()) return {};



  const auto FromRaw = [](const char* const raw) -> Maybe<std::string> {

    if (!raw) return {};

    return Some(std::string(raw));

  };



  switch (pname) {

    case LOCAL_GL_EXTENSIONS: {

      if (!gl->IsCoreProfile()) {

        const auto rawExt = (const char*)gl->fGetString(LOCAL_GL_EXTENSIONS);

        return Some(std::string(rawExt));

        return FromRaw(rawExt);

      }

      std::string ret;

      const auto& numExts = gl->GetIntAs<GLuint>(LOCAL_GL_NUM_EXTENSIONS);

      for (GLuint i = 0; i < numExts; i++) {

        const auto rawExt =

            (const char*)gl->fGetStringi(LOCAL_GL_EXTENSIONS, i);

        if (!rawExt) continue;



        if (i > 0) {

          ret += " ";

        }
@@ -1927,7 +1934,7 @@ Maybe<std::string> WebGLContext::GetString(const GLenum pname) const { 
    case LOCAL_GL_VENDOR:

    case LOCAL_GL_VERSION: {

      const auto raw = (const char*)gl->fGetString(pname);

      return Some(std::string(raw));

      return FromRaw(raw);

    }



    case dom::MOZ_debug_Binding::WSI_INFO: {