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

Unified Diff: Source/core/platform/graphics/GraphicsContext3D.cpp

Issue 61773005: Rename WebKit namespace to blink (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « Source/core/platform/graphics/GraphicsContext3D.h ('k') | Source/core/platform/graphics/GraphicsLayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/GraphicsContext3D.cpp
diff --git a/Source/core/platform/graphics/GraphicsContext3D.cpp b/Source/core/platform/graphics/GraphicsContext3D.cpp
index b493025fc961cfd2441ecbe85d984fb956ab581b..b44646393115f5fbdc4f5e9ea215c173a260258d 100644
--- a/Source/core/platform/graphics/GraphicsContext3D.cpp
+++ b/Source/core/platform/graphics/GraphicsContext3D.cpp
@@ -54,7 +54,7 @@ namespace WebCore {
namespace {
-void getDrawingParameters(DrawingBuffer* drawingBuffer, WebKit::WebGraphicsContext3D* graphicsContext3D,
+void getDrawingParameters(DrawingBuffer* drawingBuffer, blink::WebGraphicsContext3D* graphicsContext3D,
Platform3DObject* frameBufferId, int* width, int* height)
{
ASSERT(drawingBuffer);
@@ -65,7 +65,7 @@ void getDrawingParameters(DrawingBuffer* drawingBuffer, WebKit::WebGraphicsConte
} // anonymous namespace
-GraphicsContext3D::GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer)
+GraphicsContext3D::GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer)
: m_impl(webContext.get())
, m_ownedWebContext(webContext)
, m_initializedAvailableExtensions(false)
@@ -77,7 +77,7 @@ GraphicsContext3D::GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3D> we
{
}
-GraphicsContext3D::GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer)
+GraphicsContext3D::GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer)
: m_provider(provider)
, m_impl(m_provider->context3d())
, m_initializedAvailableExtensions(false)
@@ -206,7 +206,7 @@ rt GraphicsContext3D::name(t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6, t7 a7, t8 a
return m_impl->name(a1, a2, a3, a4, a5, a6, a7, a8, a9); \
}
-class GraphicsContext3DContextLostCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
+class GraphicsContext3DContextLostCallbackAdapter : public blink::WebGraphicsContext3D::WebGraphicsContextLostCallback {
public:
GraphicsContext3DContextLostCallbackAdapter(PassOwnPtr<GraphicsContext3D::ContextLostCallback> callback)
: m_contextLostCallback(callback) { }
@@ -221,13 +221,13 @@ private:
OwnPtr<GraphicsContext3D::ContextLostCallback> m_contextLostCallback;
};
-class GraphicsContext3DErrorMessageCallbackAdapter : public WebKit::WebGraphicsContext3D::WebGraphicsErrorMessageCallback {
+class GraphicsContext3DErrorMessageCallbackAdapter : public blink::WebGraphicsContext3D::WebGraphicsErrorMessageCallback {
public:
GraphicsContext3DErrorMessageCallbackAdapter(PassOwnPtr<GraphicsContext3D::ErrorMessageCallback> callback)
: m_errorMessageCallback(callback) { }
virtual ~GraphicsContext3DErrorMessageCallbackAdapter() { }
- virtual void onErrorMessage(const WebKit::WebString& message, WebKit::WGC3Dint id)
+ virtual void onErrorMessage(const blink::WebString& message, blink::WGC3Dint id)
{
if (m_errorMessageCallback)
m_errorMessageCallback->onErrorMessage(message, id);
@@ -254,7 +254,7 @@ void GraphicsContext3D::setErrorMessageCallback(PassOwnPtr<GraphicsContext3D::Er
PassRefPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attributes attrs)
{
- WebKit::WebGraphicsContext3D::Attributes webAttributes;
+ blink::WebGraphicsContext3D::Attributes webAttributes;
webAttributes.alpha = attrs.alpha;
webAttributes.depth = attrs.depth;
webAttributes.stencil = attrs.stencil;
@@ -265,20 +265,20 @@ PassRefPtr<GraphicsContext3D> GraphicsContext3D::create(GraphicsContext3D::Attri
webAttributes.preferDiscreteGPU = attrs.preferDiscreteGPU;
webAttributes.topDocumentURL = attrs.topDocumentURL.string();
- OwnPtr<WebKit::WebGraphicsContext3D> webContext = adoptPtr(WebKit::Platform::current()->createOffscreenGraphicsContext3D(webAttributes));
+ OwnPtr<blink::WebGraphicsContext3D> webContext = adoptPtr(blink::Platform::current()->createOffscreenGraphicsContext3D(webAttributes));
if (!webContext)
return 0;
return GraphicsContext3D::createGraphicsContextFromWebContext(webContext.release(), attrs.preserveDrawingBuffer);
}
-PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromProvider(PassOwnPtr<WebKit::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer)
+PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromProvider(PassOwnPtr<blink::WebGraphicsContext3DProvider> provider, bool preserveDrawingBuffer)
{
RefPtr<GraphicsContext3D> context = adoptRef(new GraphicsContext3D(provider, preserveDrawingBuffer));
return context.release();
}
-PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromWebContext(PassOwnPtr<WebKit::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer)
+PassRefPtr<GraphicsContext3D> GraphicsContext3D::createGraphicsContextFromWebContext(PassOwnPtr<blink::WebGraphicsContext3D> webContext, bool preserveDrawingBuffer)
{
RefPtr<GraphicsContext3D> context = adoptRef(new GraphicsContext3D(webContext, preserveDrawingBuffer));
return context.release();
@@ -351,7 +351,7 @@ DELEGATE_TO_WEBCONTEXT_1(generateMipmap, GC3Denum)
bool GraphicsContext3D::getActiveAttrib(Platform3DObject program, GC3Duint index, ActiveInfo& info)
{
- WebKit::WebGraphicsContext3D::ActiveInfo webInfo;
+ blink::WebGraphicsContext3D::ActiveInfo webInfo;
if (!m_impl->getActiveAttrib(program, index, webInfo))
return false;
info.name = webInfo.name;
@@ -362,7 +362,7 @@ bool GraphicsContext3D::getActiveAttrib(Platform3DObject program, GC3Duint index
bool GraphicsContext3D::getActiveUniform(Platform3DObject program, GC3Duint index, ActiveInfo& info)
{
- WebKit::WebGraphicsContext3D::ActiveInfo webInfo;
+ blink::WebGraphicsContext3D::ActiveInfo webInfo;
if (!m_impl->getActiveUniform(program, index, webInfo))
return false;
info.name = webInfo.name;
@@ -383,7 +383,7 @@ DELEGATE_TO_WEBCONTEXT_3(getBufferParameteriv, GC3Denum, GC3Denum, GC3Dint*)
GraphicsContext3D::Attributes GraphicsContext3D::getContextAttributes()
{
- WebKit::WebGraphicsContext3D::Attributes webAttributes = m_impl->getContextAttributes();
+ blink::WebGraphicsContext3D::Attributes webAttributes = m_impl->getContextAttributes();
GraphicsContext3D::Attributes attributes;
attributes.alpha = webAttributes.alpha;
attributes.depth = webAttributes.depth;
« no previous file with comments | « Source/core/platform/graphics/GraphicsContext3D.h ('k') | Source/core/platform/graphics/GraphicsLayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698