Merge 120636 - Fix framebuffer-object-attachment.html failures

Source/WebCore/html/canvas/WebGLFramebuffer.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 110 matching lines @@
     }
 
     void WebGLRenderbufferAttachment::attach(GraphicsContext3D* context, GC3Denum attachment)
     {
         Platform3DObject object = objectOrZero(m_renderbuffer.get());
         context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, attachment, GraphicsContext3D::RENDERBUFFER, object);
     }
 
     void WebGLRenderbufferAttachment::unattach(GraphicsContext3D* context, GC3Denum attachment)
     {
-        if (attachment == GraphicsContext3D::DEPTH_STENCIL) {
+        if (attachment == GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT) {
             context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::DEPTH_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, 0);
             context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::STENCIL_ATTACHMENT, GraphicsContext3D::RENDERBUFFER, 0);
         } else
             context->framebufferRenderbuffer(GraphicsContext3D::FRAMEBUFFER, attachment, GraphicsContext3D::RENDERBUFFER, 0);
     }
 
     class WebGLTextureAttachment : public WebGLFramebuffer::WebGLAttachment {
     public:
         static PassRefPtr<WebGLFramebuffer::WebGLAttachment> create(WebGLTexture*, GC3Denum target, GC3Dint level);
 
@@ skipping 134 matching lines @@
 }
 
 WebGLFramebuffer::~WebGLFramebuffer()
 {
     deleteObject(0);
 }
 
 void WebGLFramebuffer::setAttachmentForBoundFramebuffer(GC3Denum attachment, GC3Denum texTarget, WebGLTexture* texture, GC3Dint level)
 {
     ASSERT(isBound());
+    removeAttachmentFromBoundFramebuffer(attachment);
     if (!object())
         return;
-    removeAttachmentFromBoundFramebuffer(attachment);
     if (texture && texture->object()) {
-
         m_attachments.add(attachment, WebGLTextureAttachment::create(texture, texTarget, level));
         texture->onAttached();
     }
 }
 
 void WebGLFramebuffer::setAttachmentForBoundFramebuffer(GC3Denum attachment, WebGLRenderbuffer* renderbuffer)
 {
     ASSERT(isBound());
+    removeAttachmentFromBoundFramebuffer(attachment);
     if (!object())
         return;
-    removeAttachmentFromBoundFramebuffer(attachment);
     if (renderbuffer && renderbuffer->object()) {
         m_attachments.add(attachment, WebGLRenderbufferAttachment::create(renderbuffer));
         renderbuffer->onAttached();
     }
 }
 
 void WebGLFramebuffer::attach(GC3Denum attachment, GC3Denum attachmentPoint)
 {
     ASSERT(isBound());
     WebGLAttachment* attachmentObject = getAttachment(attachment);
@@ skipping 18 matching lines @@
 void WebGLFramebuffer::removeAttachmentFromBoundFramebuffer(GC3Denum attachment)
 {
     ASSERT(isBound());
     if (!object())
         return;
 
     WebGLAttachment* attachmentObject = getAttachment(attachment);
     if (attachmentObject) {
         attachmentObject->onDetached(context()->graphicsContext3D());
         m_attachments.remove(attachment);
+        switch (attachment) {
+        case GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT:
+            attach(GraphicsContext3D::DEPTH_ATTACHMENT, GraphicsContext3D::DEPTH_ATTACHMENT);
+            attach(GraphicsContext3D::STENCIL_ATTACHMENT, GraphicsContext3D::STENCIL_ATTACHMENT);
+            break;
+        case GraphicsContext3D::DEPTH_ATTACHMENT:
+            attach(GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT, GraphicsContext3D::DEPTH_ATTACHMENT);
+            break;
+        case GraphicsContext3D::STENCIL_ATTACHMENT:
+            attach(GraphicsContext3D::DEPTH_STENCIL_ATTACHMENT, GraphicsContext3D::STENCIL_ATTACHMENT);
+            break;
+        }
     }
 }
 
 void WebGLFramebuffer::removeAttachmentFromBoundFramebuffer(WebGLSharedObject* attachment)
 {
     ASSERT(isBound());
     if (!object())
         return;
     if (!attachment)
         return;
@@ skipping 216 matching lines @@
 }
 
 bool WebGLFramebuffer::isBound() const
 {
     return (context()->m_framebufferBinding.get() == this);
 }
 
 }
 
 #endif // ENABLE(WEBGL)