Remove WGC3D typedefs and move WebGraphicsInfo to Platform.

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 92 matching lines @@
     // Copies the multisample color buffer to the normal color buffer and leaves m_fbo bound.
     void commit();
 
     // commit should copy the full multisample buffer, and not respect the
     // current scissor bounds. Track the state of the scissor test so that it
     // can be disabled during calls to commit.
     void setScissorEnabled(bool scissorEnabled) { m_scissorEnabled = scissorEnabled; }
 
     // The DrawingBuffer needs to track the texture bound to texture unit 0.
     // The bound texture is tracked to avoid costly queries during rendering.
-    void setTexture2DBinding(Platform3DObject texture) { m_texture2DBinding = texture; }
+    void setTexture2DBinding(GLuint texture) { m_texture2DBinding = texture; }
 
     // The DrawingBuffer needs to track the currently bound framebuffer so it
     // restore the binding when needed.
-    void setFramebufferBinding(GLenum target, Platform3DObject fbo)
+    void setFramebufferBinding(GLenum target, GLuint fbo)
     {
         switch (target) {
         case GL_FRAMEBUFFER:
             m_drawFramebufferBinding = fbo;
             m_readFramebufferBinding = fbo;
             break;
         case GL_DRAW_FRAMEBUFFER:
             m_drawFramebufferBinding = fbo;
             break;
         case GL_READ_FRAMEBUFFER:
             m_readFramebufferBinding = fbo;
             break;
         default:
             ASSERT(0);
         }
     }
 
     // Track the currently active texture unit. Texture unit 0 is used as host for a scratch
     // texture.
     void setActiveTextureUnit(GLint textureUnit) { m_activeTextureUnit = textureUnit; }
 
     bool multisample() const;
 
-    Platform3DObject framebuffer() const;
+    GLuint framebuffer() const;
 
     bool discardFramebufferSupported() const { return m_discardFramebufferSupported; }
 
     void markContentsChanged();
     void setBufferClearNeeded(bool);
     bool bufferClearNeeded() const;
     void setIsHidden(bool);
     void setFilterQuality(SkFilterQuality);
 
     WebLayer* platformLayer();
 
     WebGraphicsContext3D* context();
     gpu::gles2::GLES2Interface* contextGL();
     WebGraphicsContext3DProvider* contextProvider();
 
     // Returns the actual context attributes for this drawing buffer which may differ from the
     // requested context attributes due to implementation limits.
     WebGraphicsContext3D::Attributes getActualAttributes() const { return m_actualAttributes; }
 
     // WebExternalTextureLayerClient implementation.
     bool prepareMailbox(WebExternalTextureMailbox*, WebExternalBitmap*) override;
     void mailboxReleased(const WebExternalTextureMailbox&, bool lostResource = false) override;
 
     // Destroys the TEXTURE_2D binding for the owned context
-    bool copyToPlatformTexture(WebGraphicsContext3D*, gpu::gles2::GLES2Interface*, Platform3DObject texture, GLenum internalFormat,
+    bool copyToPlatformTexture(WebGraphicsContext3D*, gpu::gles2::GLES2Interface*, GLuint texture, GLenum internalFormat,
         GLenum destType, GLint level, bool premultiplyAlpha, bool flipY, SourceDrawingBuffer);
 
     void setPackAlignment(GLint param);
 
     bool paintRenderingResultsToImageData(int&, int&, SourceDrawingBuffer, WTF::ArrayBufferContents&);
 
     int sampleCount() const { return m_sampleCount; }
     bool explicitResolveOfMultisampleData() const { return m_antiAliasingMode == MSAAExplicitResolve; }
 
     // Bind to m_drawFramebufferBinding or m_readFramebufferBinding if it's not 0.
     // Otherwise, bind to the default FBO.
     void restoreFramebufferBindings();
 
     void addNewMailboxCallback(PassOwnPtr<SameThreadClosure> closure) { m_newMailboxCallback = std::move(closure); }
 
 protected: // For unittests
     DrawingBuffer(
         PassOwnPtr<WebGraphicsContext3DProvider>,
         PassOwnPtr<Extensions3DUtil>,
         bool multisampleExtensionSupported,
         bool discardFramebufferSupported,
         PreserveDrawingBuffer,
         WebGraphicsContext3D::Attributes requestedAttributes);
 
     bool initialize(const IntSize&);
 
 private:
     struct TextureParameters {
         DISALLOW_NEW();
-        WGC3Denum target;
-        WGC3Denum internalColorFormat;
-        WGC3Denum colorFormat;
-        WGC3Denum internalRenderbufferFormat;
+        GLenum target;
+        GLenum internalColorFormat;
+        GLenum colorFormat;
+        GLenum internalRenderbufferFormat;
 
         TextureParameters()
             : target(0)
             , internalColorFormat(0)
             , colorFormat(0)
             , 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();
-        Platform3DObject textureId;
-        WGC3Duint imageId;
+        GLuint textureId;
+        GLuint imageId;
         TextureParameters parameters;
 
         TextureInfo()
             : textureId(0)
             , imageId(0)
         {
         }
     };
 
     struct MailboxInfo : public RefCounted<MailboxInfo> {
@@ skipping 16 matching lines @@
     TextureParameters chromiumImageTextureParameters();
 
     // The texture parameters to use for a default texture.
     TextureParameters defaultTextureParameters();
 
     void mailboxReleasedWithoutRecycling(const WebExternalTextureMailbox&);
 
     // Creates and binds a texture with the given parameters. Returns 0 on
     // failure, or the newly created texture id on success. The caller takes
     // ownership of the newly created texture.
-    WebGLId createColorTexture(const TextureParameters&);
+    GLuint createColorTexture(const TextureParameters&);
 
     // Create the depth/stencil and multisample buffers, if needed.
     void createSecondaryBuffers();
     bool resizeFramebuffer(const IntSize&);
     bool resizeMultisampleFramebuffer(const IntSize&);
     void resizeDepthStencil(const IntSize&);
 
     void clearPlatformLayer();
 
     PassRefPtr<MailboxInfo> recycledMailbox();
@@ skipping 30 matching lines @@
 
     // Creates and allocates space for a default texture.
     TextureInfo createDefaultTextureAndAllocateMemory(const IntSize&);
 
     void resizeTextureMemory(TextureInfo*, const IntSize&);
 
     void attachColorBufferToCurrentFBO();
 
     PreserveDrawingBuffer m_preserveDrawingBuffer;
     bool m_scissorEnabled;
-    Platform3DObject m_texture2DBinding;
-    Platform3DObject m_drawFramebufferBinding;
-    Platform3DObject m_readFramebufferBinding;
+    GLuint m_texture2DBinding;
+    GLuint m_drawFramebufferBinding;
+    GLuint m_readFramebufferBinding;
     GLenum m_activeTextureUnit;
 
     OwnPtr<WebGraphicsContext3DProvider> m_contextProvider;
     WebGraphicsContext3D* m_context; // Lifetime is tied to the m_contextProvider.
     gpu::gles2::GLES2Interface* m_gl; // Lifetime is tied to the m_contextProvider.
     OwnPtr<Extensions3DUtil> m_extensionsUtil;
     IntSize m_size;
     WebGraphicsContext3D::Attributes m_requestedAttributes;
     bool m_multisampleExtensionSupported;
     bool m_discardFramebufferSupported;
@@ skipping 53 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