1 DS is defined elsewhere, as is HAVE_SINCOS.

     2 Will not send upstream.

     3 

     4 --- a/js/src/jsmath.cpp    2016-03-22 13:29:37.873777320 -0700

     5 +++ b/js/src/jsmath.cpp    2016-03-22 13:29:55.750437374 -0700

     6 @@ -919,7 +919,7 @@ js::math_sincos_uncached(double x, doubl

     7  {

     8  #if defined(__GLIBC__)

     9      sincos(x, sin, cos);

    10 -#elif defined(HAVE_SINCOS)

    11 +#elif defined(_HAVE_SINCOS)

    12      __sincos(x, sin, cos);

    13  #else

    14      *sin = js::math_sin_uncached(x);

    15 --- a/dom/canvas/WebGLFormats.cpp	2016-03-22 12:40:33.085785762 -0700

    16 +++ b/dom/canvas/WebGLFormats.cpp	2016-03-22 12:40:59.650189892 -0700

    17 @@ -156,7 +156,7 @@ AddFormatInfo(EffectiveFormat format, co

    18          hasStencil = true;

    19          break;

    20  

    21 -    case UnsizedFormat::DS:

    22 +    case UnsizedFormat::XDS:

    23          hasDepth = true;

    24          hasStencil = true;

    25          break;

    26 @@ -241,8 +241,8 @@ InitFormatInfo()

    27      AddFormatInfo(FOO(DEPTH_COMPONENT16 ), 2, UnsizedFormat::D , false, ComponentType::NormUInt);

    28      AddFormatInfo(FOO(DEPTH_COMPONENT24 ), 3, UnsizedFormat::D , false, ComponentType::NormUInt);

    29      AddFormatInfo(FOO(DEPTH_COMPONENT32F), 4, UnsizedFormat::D , false, ComponentType::Float);

    30 -    AddFormatInfo(FOO(DEPTH24_STENCIL8  ), 4, UnsizedFormat::DS, false, ComponentType::Special);

    31 -    AddFormatInfo(FOO(DEPTH32F_STENCIL8 ), 5, UnsizedFormat::DS, false, ComponentType::Special);

    32 +    AddFormatInfo(FOO(DEPTH24_STENCIL8  ), 4, UnsizedFormat::XDS, false, ComponentType::Special);

    33 +    AddFormatInfo(FOO(DEPTH32F_STENCIL8 ), 5, UnsizedFormat::XDS, false, ComponentType::Special);

    34  

    35      // GLES 3.0.4, p205-206, "Required Renderbuffer Formats"

    36      AddFormatInfo(FOO(STENCIL_INDEX8), 1, UnsizedFormat::S, false, ComponentType::UInt);

    37 --- a/dom/canvas/WebGLFormats.h	2016-03-22 12:39:45.933021022 -0700

    38 +++ b/dom/canvas/WebGLFormats.h	2016-03-22 12:40:19.073659489 -0700

    39 @@ -158,7 +158,7 @@ enum class UnsizedFormat : uint8_t {

    40      A,

    41      D,

    42      S,

    43 -    DS,

    44 +    XDS,

    45  };

    46  

    47  // GLES 3.0.4 p114 Table 3.4, p240