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

Source/WebCore/html/canvas/WebGLFramebuffer.h

Index: Source/WebCore/html/canvas/WebGLFramebuffer.h
===================================================================
--- Source/WebCore/html/canvas/WebGLFramebuffer.h	(revision 120837)
+++ Source/WebCore/html/canvas/WebGLFramebuffer.h	(working copy)
@@ -71,9 +71,6 @@
     void removeAttachmentFromBoundFramebuffer(GC3Denum);
     WebGLSharedObject* getAttachmentObject(GC3Denum) const;
 
-    // attach 'attachment' at 'attachmentPoint'.
-    void attach(GC3Denum attachment, GC3Denum attachmentPoint);
-
     GC3Denum getColorBufferFormat() const;
     GC3Dsizei getColorBufferWidth() const;
     GC3Dsizei getColorBufferHeight() const;
@@ -114,6 +111,9 @@
     // Check if the framebuffer is currently bound.
     bool isBound() const;
 
+    // attach 'attachment' at 'attachmentPoint'.
+    void attach(GC3Denum attachment, GC3Denum attachmentPoint);
+
     typedef WTF::HashMap<GC3Denum, RefPtr<WebGLAttachment> > AttachmentMap;
 
     AttachmentMap m_attachments;