Index: Source/core/platform/graphics/GraphicsContext3D.h |
diff --git a/Source/core/platform/graphics/GraphicsContext3D.h b/Source/core/platform/graphics/GraphicsContext3D.h |
index 13283413945e09d1f1475513d4e9e933160bfc02..f470e97ef1deb1b680817fb786aaa0b49e0c0855 100644 |
--- a/Source/core/platform/graphics/GraphicsContext3D.h |
+++ b/Source/core/platform/graphics/GraphicsContext3D.h |
@@ -48,7 +48,7 @@ |
class GrContext; |
-namespace WebKit { |
+namespace blink { |
class WebGraphicsContext3D; |
class WebGraphicsContext3DProvider; |
} |
@@ -432,13 +432,13 @@ public: |
// Callers must make the context current before using it AND check that the context was created successfully |
// via ContextLost before using the context in any way. Once made current on a thread, the context cannot |
// be used on any other thread. |
- static PassRefPtr<GraphicsContext3D> createGraphicsContextFromWebContext(PassOwnPtr<WebKit::WebGraphicsContext3D>, bool preserveDrawingBuffer = false); |
- static PassRefPtr<GraphicsContext3D> createGraphicsContextFromProvider(PassOwnPtr<WebKit::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer = false); |
+ static PassRefPtr<GraphicsContext3D> createGraphicsContextFromWebContext(PassOwnPtr<blink::WebGraphicsContext3D>, bool preserveDrawingBuffer = false); |
+ static PassRefPtr<GraphicsContext3D> createGraphicsContextFromProvider(PassOwnPtr<blink::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer = false); |
~GraphicsContext3D(); |
GrContext* grContext(); |
- WebKit::WebGraphicsContext3D* webContext() const { return m_impl; } |
+ blink::WebGraphicsContext3D* webContext() const { return m_impl; } |
bool makeContextCurrent(); |
@@ -798,8 +798,8 @@ public: |
private: |
friend class Extensions3D; |
- GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3D>, bool preserveDrawingBuffer); |
- GraphicsContext3D(PassOwnPtr<WebKit::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer); |
+ GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3D>, bool preserveDrawingBuffer); |
+ GraphicsContext3D(PassOwnPtr<blink::WebGraphicsContext3DProvider>, bool preserveDrawingBuffer); |
// Helper for packImageData/extractImageData/extractTextureData which implement packing of pixel |
// data into the specified OpenGL destination format and type. |
@@ -822,11 +822,11 @@ private: |
bool preserveDrawingBuffer() const { return m_preserveDrawingBuffer; } |
- OwnPtr<WebKit::WebGraphicsContext3DProvider> m_provider; |
- WebKit::WebGraphicsContext3D* m_impl; |
+ OwnPtr<blink::WebGraphicsContext3DProvider> m_provider; |
+ blink::WebGraphicsContext3D* m_impl; |
OwnPtr<GraphicsContext3DContextLostCallbackAdapter> m_contextLostCallbackAdapter; |
OwnPtr<GraphicsContext3DErrorMessageCallbackAdapter> m_errorMessageCallbackAdapter; |
- OwnPtr<WebKit::WebGraphicsContext3D> m_ownedWebContext; |
+ OwnPtr<blink::WebGraphicsContext3D> m_ownedWebContext; |
OwnPtr<Extensions3D> m_extensions; |
bool m_initializedAvailableExtensions; |
HashSet<String> m_enabledExtensions; |