Move special DEPTH_STENCIL attachment logic from command buffers to WebGL1

third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp

Index: third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
index 5ee321dd48e65bd1b36e64d371f32184cd702e81..9c976e9cd5d6ef6bf64d3e53cde1613394f8050b 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.cpp
@@ -463,27 +463,8 @@ void WebGL2RenderingContextBase::framebufferTextureLayer(GLenum target,
                       "no framebuffer bound");
     return;
   }
-  if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-    contextGL()->FramebufferTextureLayer(target, GL_DEPTH_ATTACHMENT,
-                                         objectOrZero(texture), level, layer);
-    contextGL()->FramebufferTextureLayer(target, GL_STENCIL_ATTACHMENT,
-                                         objectOrZero(texture), level, layer);
-  } else {
-    contextGL()->FramebufferTextureLayer(target, attachment,
-                                         objectOrZero(texture), level, layer);
-  }
-  if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-    // On ES3, DEPTH_STENCIL_ATTACHMENT is like an alias for DEPTH_ATTACHMENT +
-    // STENCIL_ATTACHMENT.  We divide it here so in WebGLFramebuffer, we don't
-    // have to handle DEPTH_STENCIL_ATTACHMENT in WebGL 2.
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_DEPTH_ATTACHMENT, textarget, texture, level, layer);
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, GL_STENCIL_ATTACHMENT, textarget, texture, level, layer);
-  } else {
-    framebufferBinding->setAttachmentForBoundFramebuffer(
-        target, attachment, textarget, texture, level, layer);
-  }
+  framebufferBinding->setAttachmentForBoundFramebuffer(
+      target, attachment, textarget, texture, level, layer);
   applyStencilTest();
 }