Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1467)

Unified Diff: Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp

Issue 15301006: Merged GraphicsContext3DPrivate into GraphicsContext3D (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp
diff --git a/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp b/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp
index 15dd63677c57e039d190312f236ecd33f668a80b..c6f7bfd2a0f97eb023b3bd55893c8686aa91697a 100644
--- a/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp
+++ b/Source/core/platform/graphics/gpu/SharedGraphicsContext3D.cpp
@@ -28,8 +28,8 @@
#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>
@@ -56,13 +56,13 @@ public:
}
if (webContext && grContext) {
- WebKit::WebGraphicsContext3D* oldWebContext = m_context ? GraphicsContext3DPrivate::extractWebGraphicsContext3D(m_context.get()) : 0;
+ WebKit::WebGraphicsContext3D* oldWebContext = m_context ? GraphicsContext3D::extractWebGraphicsContext3D(m_context.get()) : 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;
}
}

Powered by Google App Engine
This is Rietveld 408576698