| Index: webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| index b74a4e6c52b02667ead12a837b2822836babfa00..7ebc5e81f715fa52e39ebd35167daf85e2d8e42d 100644
|
| --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
|
| @@ -22,20 +22,20 @@ class GLES2Implementation;
|
| }
|
| }
|
|
|
| -using WebKit::WebGLId;
|
| -
|
| -using WebKit::WGC3Dbyte;
|
| -using WebKit::WGC3Dchar;
|
| -using WebKit::WGC3Denum;
|
| -using WebKit::WGC3Dboolean;
|
| -using WebKit::WGC3Dbitfield;
|
| -using WebKit::WGC3Dint;
|
| -using WebKit::WGC3Dsizei;
|
| -using WebKit::WGC3Duint;
|
| -using WebKit::WGC3Dfloat;
|
| -using WebKit::WGC3Dclampf;
|
| -using WebKit::WGC3Dintptr;
|
| -using WebKit::WGC3Dsizeiptr;
|
| +using blink::WebGLId;
|
| +
|
| +using blink::WGC3Dbyte;
|
| +using blink::WGC3Dchar;
|
| +using blink::WGC3Denum;
|
| +using blink::WGC3Dboolean;
|
| +using blink::WGC3Dbitfield;
|
| +using blink::WGC3Dint;
|
| +using blink::WGC3Dsizei;
|
| +using blink::WGC3Duint;
|
| +using blink::WGC3Dfloat;
|
| +using blink::WGC3Dclampf;
|
| +using blink::WGC3Dintptr;
|
| +using blink::WGC3Dsizeiptr;
|
|
|
| namespace gpu {
|
| class GLInProcessContext;
|
| @@ -46,28 +46,28 @@ namespace webkit {
|
| namespace gpu {
|
|
|
| class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| - : public NON_EXPORTED_BASE(WebKit::WebGraphicsContext3D) {
|
| + : public NON_EXPORTED_BASE(blink::WebGraphicsContext3D) {
|
| public:
|
| static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
|
| CreateViewContext(
|
| - const WebKit::WebGraphicsContext3D::Attributes& attributes,
|
| + const blink::WebGraphicsContext3D::Attributes& attributes,
|
| gfx::AcceleratedWidget window);
|
|
|
| static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
|
| CreateOffscreenContext(
|
| - const WebKit::WebGraphicsContext3D::Attributes& attributes);
|
| + const blink::WebGraphicsContext3D::Attributes& attributes);
|
|
|
| static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>
|
| WrapContext(
|
| scoped_ptr< ::gpu::GLInProcessContext> context,
|
| - const WebKit::WebGraphicsContext3D::Attributes& attributes);
|
| + const blink::WebGraphicsContext3D::Attributes& attributes);
|
|
|
| virtual ~WebGraphicsContext3DInProcessCommandBufferImpl();
|
|
|
| // Convert WebGL context creation attributes into GLInProcessContext / EGL
|
| // size requests.
|
| static void ConvertAttributes(
|
| - const WebKit::WebGraphicsContext3D::Attributes& attributes,
|
| + const blink::WebGraphicsContext3D::Attributes& attributes,
|
| ::gpu::GLInProcessContextAttribs* output_attribs);
|
|
|
| //----------------------------------------------------------------------
|
| @@ -214,7 +214,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
|
|
| virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value);
|
|
|
| - virtual WebKit::WebString getProgramInfoLog(WebGLId program);
|
| + virtual blink::WebString getProgramInfoLog(WebGLId program);
|
|
|
| virtual void getRenderbufferParameteriv(WGC3Denum target,
|
| WGC3Denum pname,
|
| @@ -222,15 +222,15 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
|
|
| virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value);
|
|
|
| - virtual WebKit::WebString getShaderInfoLog(WebGLId shader);
|
| + virtual blink::WebString getShaderInfoLog(WebGLId shader);
|
|
|
| virtual void getShaderPrecisionFormat(WGC3Denum shadertype,
|
| WGC3Denum precisiontype,
|
| WGC3Dint* range,
|
| WGC3Dint* precision);
|
|
|
| - virtual WebKit::WebString getShaderSource(WebGLId shader);
|
| - virtual WebKit::WebString getString(WGC3Denum name);
|
| + virtual blink::WebString getShaderSource(WebGLId shader);
|
| + virtual blink::WebString getString(WGC3Denum name);
|
|
|
| virtual void getTexParameterfv(WGC3Denum target,
|
| WGC3Denum pname,
|
| @@ -451,7 +451,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
|
|
| virtual void rateLimitOffscreenContextCHROMIUM();
|
|
|
| - virtual WebKit::WebString getRequestableExtensionsCHROMIUM();
|
| + virtual blink::WebString getRequestableExtensionsCHROMIUM();
|
| virtual void requestExtensionCHROMIUM(const char*);
|
|
|
| virtual void blitFramebufferCHROMIUM(
|
| @@ -462,7 +462,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| WGC3Denum target, WGC3Dsizei samples, WGC3Denum internalformat,
|
| WGC3Dsizei width, WGC3Dsizei height);
|
|
|
| - virtual WebKit::WebString getTranslatedShaderSourceANGLE(WebGLId shader);
|
| + virtual blink::WebString getTranslatedShaderSourceANGLE(WebGLId shader);
|
|
|
| virtual void setContextLostCallback(
|
| WebGraphicsContext3D::WebGraphicsContextLostCallback* callback);
|
| @@ -558,7 +558,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| private:
|
| WebGraphicsContext3DInProcessCommandBufferImpl(
|
| scoped_ptr< ::gpu::GLInProcessContext> context,
|
| - const WebKit::WebGraphicsContext3D::Attributes& attributes,
|
| + const blink::WebGraphicsContext3D::Attributes& attributes,
|
| bool is_offscreen,
|
| gfx::AcceleratedWidget window);
|
|
|
| @@ -587,7 +587,7 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl
|
| WebGraphicsContext3D::WebGraphicsContextLostCallback* context_lost_callback_;
|
| WGC3Denum context_lost_reason_;
|
|
|
| - WebKit::WebGraphicsContext3D::Attributes attributes_;
|
| + blink::WebGraphicsContext3D::Attributes attributes_;
|
|
|
| // Errors raised by synthesizeGLError().
|
| std::vector<WGC3Denum> synthetic_errors_;
|
|
|