Merged GraphicsContext3DPrivate into GraphicsContext3D

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

 /*
  * Copyright (C) 2011 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:
  *
  * 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
@@ skipping 10 matching lines @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
 #include "config.h"
 
 #include "core/platform/graphics/gpu/SharedGraphicsContext3D.h"
 
-#include "core/platform/chromium/support/GraphicsContext3DPrivate.h"
 #include "core/platform/graphics/Extensions3D.h"
+#include "core/platform/graphics/GraphicsContext3D.h"
 #include <public/Platform.h>
 #include <public/WebGraphicsContext3D.h>
 #include <public/WebGraphicsContext3DProvider.h>
 #include <wtf/MainThread.h>
 
 namespace WebCore {
 
 class SharedGraphicsContext3DImpl {
 public:
     SharedGraphicsContext3DImpl() : m_context(0) { }
 
     PassRefPtr<GraphicsContext3D> getOrCreateContext()
     {
         bool wasCreated = false;
 
         OwnPtr<WebKit::WebGraphicsContext3DProvider> provider = adoptPtr(WebKit::Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
 
         WebKit::WebGraphicsContext3D* webContext = 0;
         GrContext* grContext = 0;
 
         if (provider) {
             webContext = provider->context3d();
             grContext = provider->grContext();
         }
 
         if (webContext && grContext) {
-            WebKit::WebGraphicsContext3D* oldWebContext = m_context ? GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get()) : 0;
+            WebKit::WebGraphicsContext3D* oldWebContext = m_context ? m_context->webContext() : 0;
             GrContext* oldGrContext = m_context ? m_context->grContext() : 0;
             if (webContext != oldWebContext || grContext != oldGrContext)
                 m_context.clear();
 
             if (!m_context) {
-                m_context = GraphicsContext3DPrivate::createGraphicsContextFromProvider(provider.release());
+                m_context = GraphicsContext3D::createGraphicsContextFromProvider(provider.release());
                 wasCreated = true;
             }
         }
 
         if (m_context && wasCreated)
             m_context->getExtensions()->pushGroupMarkerEXT("SharedGraphicsContext");
         return m_context;
     }
 
 private:
     RefPtr<GraphicsContext3D> m_context;
 };
 
 PassRefPtr<GraphicsContext3D> SharedGraphicsContext3D::get()
 {
     DEFINE_STATIC_LOCAL(SharedGraphicsContext3DImpl, impl, ());
     return impl.getOrCreateContext();
 }
 
 }  // namespace WebCore