Clean up multisampled color mask workaround for DrawingBuffer.

third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.h

 /*
  * Copyright (c) 2010, Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 225 matching lines @@
     struct TextureParameters {
         DISALLOW_NEW();
         GLenum target = 0;
         GLenum internalColorFormat = 0;
 
         // The internal color format used when allocating storage for the
         // texture. This may be different from internalColorFormat if RGB
         // emulation is required.
         GLenum creationInternalColorFormat = 0;
         GLenum colorFormat = 0;
-        GLenum internalRenderbufferFormat = 0;
     };
 
     // If we used CHROMIUM_image as the backing storage for our buffers,
     // we need to know the mapping from texture id to image.
     struct TextureInfo {
         DISALLOW_NEW();
         GLuint textureId = 0;
         GLuint imageId = 0;
         TextureParameters parameters;
     };
@@ skipping 84 matching lines @@
     void attachColorBufferToReadFramebuffer();
 
     // Whether the WebGL client desires an explicit resolve. This is
     // implemented by forwarding all draw operations to a multisample
     // renderbuffer, which is resolved before any read operations or swaps.
     bool wantExplicitResolve();
 
     // Whether the WebGL client wants a depth or stencil buffer.
     bool wantDepthOrStencil();
 
+    // The format to use when creating a multisampled renderbuffer.
+    GLenum getMultisampledRenderbufferFormat();
+
+    // Similar to requiresAlphaChannelToBePreserved(), but always targets the
+    // default framebuffer.
+    bool defaultBufferRequiresAlphaChannelToBePreserved();
+
     const PreserveDrawingBuffer m_preserveDrawingBuffer;
     bool m_scissorEnabled = false;
     GLuint m_texture2DBinding = 0;
     GLuint m_drawFramebufferBinding = 0;
     GLuint m_readFramebufferBinding = 0;
     GLuint m_renderbufferBinding = 0;
     GLenum m_activeTextureUnit = GL_TEXTURE0;
     GLfloat m_clearColor[4];
     GLboolean m_colorMask[4];
 
@@ skipping 10 matching lines @@
         TextureInfo texInfo;
         WebExternalTextureMailbox mailbox;
     };
     FrontBufferInfo m_frontColorBuffer;
 
     OwnPtr<SameThreadClosure> m_newMailboxCallback;
 
     // This is used when the user requests either a depth or stencil buffer.
     GLuint m_depthStencilBuffer = 0;
 
-    // For explicit resolve.
-    GLuint m_intermediateFBO = 0;
-    GLuint m_intermediateRenderbuffer = 0;
-
-    // When wantsExplicitResolve() returns true, the target of all draw
+    // When wantExplicitResolve() returns true, the target of all draw
     // operations.
     GLuint m_multisampleFBO = 0;
 
     // The id of the renderbuffer storage for |m_multisampleFBO|.
     GLuint m_multisampleRenderbuffer = 0;
 
-    // When wantsExplicitResolve() returns false, the target of all draw and
-    // read operations. When wantsExplicitResolve() returns true, the target of
+    // When wantExplicitResolve() returns false, the target of all draw and
+    // read operations. When wantExplicitResolve() returns true, the target of
     // all read operations. A swap is performed by exchanging |m_colorBuffer|
     // with |m_frontColorBuffer|.
     GLuint m_fbo = 0;
 
     // All information about the texture storage for |m_fbo|.
     TextureInfo m_colorBuffer;
 
     // True if our contents have been modified since the last presentation of this buffer.
     bool m_contentsChanged = true;
 
@@ skipping 35 matching lines @@
     // used to resize the Canvas.
     SkBitmap m_resizingBitmap;
 
     // Used to flip a bitmap vertically.
     Vector<uint8_t> m_scanline;
 };
 
 } // namespace blink
 
 #endif // DrawingBuffer_h