Merged GraphicsContext3DPrivate into GraphicsContext3D

Source/core/platform/graphics/chromium/Canvas2DLayerBridge.cpp

 /*
  * Copyright (C) 2012 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 13 matching lines @@
  */
 
 #include "config.h"
 
 #include "core/platform/graphics/chromium/Canvas2DLayerBridge.h"
 
 #include "GrContext.h"
 #include "SkDevice.h"
 #include "SkSurface.h"
 #include "core/platform/chromium/TraceEvent.h"
-#include "core/platform/chromium/support/GraphicsContext3DPrivate.h"
 #include "core/platform/graphics/GraphicsContext3D.h"
 #include "core/platform/graphics/chromium/Canvas2DLayerManager.h"
 #include "core/platform/graphics/chromium/GraphicsLayerChromium.h"
 #include <public/Platform.h>
 #include <public/WebCompositorSupport.h>
 #include <public/WebGraphicsContext3D.h>
 
 using WebKit::WebExternalTextureLayer;
 using WebKit::WebGraphicsContext3D;
 using WebKit::WebTextureUpdater;
@@ skipping 115 matching lines @@
         GrTexture* texture = renderTarget->asTexture();
         texture->invalidateCachedState();
         return texture->getTextureHandle();
     }
     return 0;
 #endif  // !ENABLE(CANVAS_USES_MAILBOX)
 }
 
 WebGraphicsContext3D* Canvas2DLayerBridge::context()
 {
-    return GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get());
+    return m_context->webContext();
 }
 
 bool Canvas2DLayerBridge::prepareMailbox(WebKit::WebExternalTextureMailbox* outMailbox)
 {
 #if ENABLE(CANVAS_USES_MAILBOX)
     // Release to skia textures that were previouosly released by the
     // compositor. We do this before acquiring the next snapshot in
     // order to cap maximum gpu memory consumption.
     m_context->makeContextCurrent();
     Vector<MailboxInfo>::iterator mailboxInfo;
@@ skipping 110 matching lines @@
     // This copy constructor should only be used for Vector reallocation
     // Assuming 'other' is to be destroyed, we swap m_image ownership
     // rather than do a refcount dance.
     memcpy(&m_mailbox, &other.m_mailbox, sizeof(m_mailbox));
     m_image.swap(const_cast<SkAutoTUnref<SkImage>*>(&other.m_image));
     m_status = other.m_status;
 }
 #endif
 
 }