Merged GraphicsContext3DPrivate into GraphicsContext3D

Source/core/platform/graphics/gpu/DrawingBuffer.cpp

 /*
  * 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 18 matching lines @@
  */
 
 #include "config.h"
 
 #include "core/platform/graphics/gpu/DrawingBuffer.h"
 
 #include <algorithm>
 #include "core/html/ImageData.h"
 #include "core/html/canvas/CanvasRenderingContext.h"
 #include "core/platform/chromium/TraceEvent.h"
-#include "core/platform/chromium/support/GraphicsContext3DPrivate.h"
 #include "core/platform/graphics/Extensions3D.h"
 #include "core/platform/graphics/GraphicsContext3D.h"
 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h"
 #include <public/Platform.h>
 #include <public/WebCompositorSupport.h>
 #include <public/WebExternalTextureLayer.h>
 #include <public/WebGraphicsContext3D.h>
 
 using namespace std;
 
@@ skipping 120 matching lines @@
     if (requiresCopyFromBackToFrontBuffer())
         updater.appendCopy(colorBuffer(), textureId, size());
 
     return textureId;
 }
 
 WebKit::WebGraphicsContext3D* DrawingBuffer::context()
 {
     if (!m_context)
         return 0;
-    return GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get());
+    return m_context->webContext();
 }
 
 bool DrawingBuffer::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox)
 {
     if (!m_context || !m_contentsChanged || !m_lastColorBuffer)
         return false;
 
     m_context->makeContextCurrent();
 
     // Resolve the multisampled buffer into the texture referenced by m_lastColorBuffer mailbox.
@@ skipping 627 matching lines @@
 
 void DrawingBuffer::bind()
 {
     if (!m_context)
         return;
 
     m_context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_multisampleFBO ? m_multisampleFBO : m_fbo);
 }
 
 } // namespace WebCore