diff options
| -rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_impl.cc | 6 | ||||
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_impl.h | 6 | ||||
| -rw-r--r-- | webkit/support/test_webkit_client.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_webkit_init.h | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index 1683691..c68625b 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -509,7 +509,7 @@ RendererWebKitClientImpl::createGraphicsContext3D() { // layout tests (though not through this code) as well as for // debugging and bringing up new ports. if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessWebGL)) { - return new webkit_gpu::WebGraphicsContext3DInProcessImpl(); + return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); } else { #if defined(ENABLE_GPU) return new WebGraphicsContext3DCommandBufferImpl(); diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index 1a91ff1..d263a00 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -21,7 +21,8 @@ using WebKit::WebGraphicsContext3D; using WebKit::WebString; using WebKit::WebView; -namespace webkit_gpu { +namespace webkit { +namespace gpu { enum { MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB, @@ -1650,5 +1651,6 @@ bool WebGraphicsContext3DInProcessImpl::AngleValidateShaderSource( return true; } -} // namespace webkit_gpu +} // namespace gpu +} // namespace webkit diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h index 4081995..479e93b 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h @@ -21,7 +21,8 @@ namespace gfx { class GLContext; } -namespace webkit_gpu { +namespace webkit { +namespace gpu { // The default implementation of WebGL. In Chromium, using this class // requires the sandbox to be disabled, which is strongly discouraged. @@ -465,7 +466,8 @@ class WebGraphicsContext3DInProcessImpl : public WebKit::WebGraphicsContext3D { ShHandle vertex_compiler_; }; -} // namespace webkit_gpu +} // namespace gpu +} // namespace webkit #endif // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc index a59dfc8..47f5b87 100644 --- a/webkit/support/test_webkit_client.cc +++ b/webkit/support/test_webkit_client.cc @@ -346,5 +346,5 @@ WebKit::WebSharedWorkerRepository* TestWebKitClient::sharedWorkerRepository() { } WebKit::WebGraphicsContext3D* TestWebKitClient::createGraphicsContext3D() { - return new webkit_gpu::WebGraphicsContext3DInProcessImpl(); + return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); } diff --git a/webkit/tools/test_shell/test_shell_webkit_init.h b/webkit/tools/test_shell/test_shell_webkit_init.h index d26307d..013ddb0 100644 --- a/webkit/tools/test_shell/test_shell_webkit_init.h +++ b/webkit/tools/test_shell/test_shell_webkit_init.h @@ -161,7 +161,7 @@ class TestShellWebKitInit : public webkit_glue::WebKitClientImpl { } virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() { - return new webkit_gpu::WebGraphicsContext3DInProcessImpl(); + return new webkit::gpu::WebGraphicsContext3DInProcessImpl(); } private: |