diff options
author | tfarina <tfarina@chromium.org> | 2015-01-08 19:16:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 03:17:25 +0000 |
commit | 70da38b26b718679d02e579c8b0ea89fd38de06a (patch) | |
tree | 570c35625412b05611da291c9bc128a4d1bde305 | |
parent | 8af6efb11ac963bad4285294a0a2c7f33f0a38ad (diff) | |
download | chromium_src-70da38b26b718679d02e579c8b0ea89fd38de06a.zip chromium_src-70da38b26b718679d02e579c8b0ea89fd38de06a.tar.gz chromium_src-70da38b26b718679d02e579c8b0ea89fd38de06a.tar.bz2 |
Extract WebGraphicsContext3DInProcessCommandBufferImpl from webkit/.
This moves it into gpu/blink/ along side WebGraphicsContext3DImpl,
consolidating more this code as we are in the process of removing
webkit/ glue directory altogether. This is one more step on this way.
BUG=338338
TEST=compositor_unittests, gpu_unittests, content_unittests
R=jamesr@chromium.org,piman@chromium.org
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/841773006
Cr-Commit-Position: refs/heads/master@{#310694}
23 files changed, 54 insertions, 57 deletions
diff --git a/android_webview/browser/hardware_renderer.cc b/android_webview/browser/hardware_renderer.cc index 65da79b..ae2c056 100644 --- a/android_webview/browser/hardware_renderer.cc +++ b/android_webview/browser/hardware_renderer.cc @@ -20,6 +20,7 @@ #include "cc/scheduler/begin_frame_source.h" #include "cc/trees/layer_tree_host.h" #include "cc/trees/layer_tree_settings.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "gpu/command_buffer/client/gl_in_process_context.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "ui/gfx/frame_time.h" @@ -28,14 +29,13 @@ #include "ui/gfx/transform.h" #include "ui/gl/gl_bindings.h" #include "webkit/common/gpu/context_provider_in_process.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace android_webview { namespace { using gpu_blink::WebGraphicsContext3DImpl; -using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; +using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl; scoped_refptr<cc::ContextProvider> CreateContext( scoped_refptr<gfx::GLSurface> surface, diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index 8fc7ff5..2164521 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -28,7 +28,6 @@ #include "gpu/command_buffer/client/gl_in_process_context.h" #include "gpu/command_buffer/service/gpu_switches.h" #include "media/base/media_switches.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace android_webview { diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc index 654db41..0fdf66e 100644 --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc @@ -10,14 +10,16 @@ #include "content/browser/android/in_process/synchronous_compositor_output_surface.h" #include "content/public/browser/browser_thread.h" #include "content/renderer/gpu/frame_swap_message_queue.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "gpu/command_buffer/client/gl_in_process_context.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "ui/gl/android/surface_texture.h" #include "ui/gl/gl_surface.h" #include "ui/gl/gl_surface_stub.h" #include "webkit/common/gpu/context_provider_in_process.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +using gpu_blink::WebGraphicsContext3DImpl; +using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl; using webkit::gpu::ContextProviderWebContext; namespace content { @@ -35,9 +37,6 @@ blink::WebGraphicsContext3D::Attributes GetDefaultAttribs() { return attributes; } -using gpu_blink::WebGraphicsContext3DImpl; -using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; - scoped_ptr<gpu::GLInProcessContext> CreateOffscreenContext( const blink::WebGraphicsContext3D::Attributes& attributes) { const gfx::GpuPreference gpu_preference = gfx::PreferDiscreteGpu; @@ -160,7 +159,6 @@ class SynchronousCompositorFactoryImpl::VideoContextProvider DISALLOW_COPY_AND_ASSIGN(VideoContextProvider); }; -using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; SynchronousCompositorFactoryImpl::SynchronousCompositorFactoryImpl() : record_full_layer_(true), @@ -236,7 +234,7 @@ SynchronousCompositorFactoryImpl::CreateStreamTextureFactory(int frame_id) { return factory; } -webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl* +WebGraphicsContext3DInProcessCommandBufferImpl* SynchronousCompositorFactoryImpl::CreateOffscreenGraphicsContext3D( const blink::WebGraphicsContext3D::Attributes& attributes) { return WrapContextWithAttributes(CreateOffscreenContext(attributes), diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.h b/content/browser/android/in_process/synchronous_compositor_factory_impl.h index 3f03685..a3739bd 100644 --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h @@ -16,11 +16,9 @@ namespace gpu { class GLInProcessContext; } -namespace webkit { -namespace gpu { +namespace gpu_blink { class WebGraphicsContext3DInProcessCommandBufferImpl; } -} namespace content { @@ -46,7 +44,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { const std::string& debug_name) override; virtual scoped_refptr<StreamTextureFactory> CreateStreamTextureFactory( int view_id) override; - virtual webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl* + virtual gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl* CreateOffscreenGraphicsContext3D( const blink::WebGraphicsContext3D::Attributes& attributes) override; diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc index 4731a20..817d732 100644 --- a/content/browser/gpu/gpu_ipc_browsertests.cc +++ b/content/browser/gpu/gpu_ipc_browsertests.cc @@ -12,8 +12,8 @@ #include "content/public/browser/gpu_data_manager.h" #include "content/public/common/content_switches.h" #include "content/public/test/content_browser_test.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "ui/gl/gl_switches.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace { diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index f1fced0..3745a37 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -47,6 +47,7 @@ #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/common/host_shared_bitmap_manager.h" #include "content/public/browser/android/compositor_client.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "gpu/command_buffer/client/context_support.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "third_party/khronos/GLES2/gl2.h" @@ -56,7 +57,6 @@ #include "ui/gfx/android/device_display_info.h" #include "ui/gfx/frame_time.h" #include "webkit/common/gpu/context_provider_in_process.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace content { diff --git a/content/common/gpu/client/gl_helper_benchmark.cc b/content/common/gpu/client/gl_helper_benchmark.cc index a394fcf..75a204d 100644 --- a/content/common/gpu/client/gl_helper_benchmark.cc +++ b/content/common/gpu/client/gl_helper_benchmark.cc @@ -26,12 +26,12 @@ #include "content/common/gpu/client/gl_helper_scaling.h" #include "content/public/test/unittest_test_suite.h" #include "content/test/content_test_suite.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkTypes.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gl/gl_surface.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" @@ -59,7 +59,7 @@ class GLHelperTest : public testing::Test { void SetUp() override { WebGraphicsContext3D::Attributes attributes; bool lose_context_when_out_of_memory = false; - context_ = webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl:: + context_ = gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl:: CreateOffscreenContext(attributes, lose_context_when_out_of_memory); context_->InitializeOnCurrentThread(); @@ -107,7 +107,7 @@ class GLHelperTest : public testing::Test { base::CloseFile(f); } - scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl> + scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl> context_; scoped_ptr<content::GLHelper> helper_; scoped_ptr<content::GLHelperScaling> helper_scaling_; diff --git a/content/common/gpu/client/gl_helper_unittest.cc b/content/common/gpu/client/gl_helper_unittest.cc index ba7d4fc..4796993 100644 --- a/content/common/gpu/client/gl_helper_unittest.cc +++ b/content/common/gpu/client/gl_helper_unittest.cc @@ -29,12 +29,12 @@ #include "content/common/gpu/client/gl_helper_scaling.h" #include "content/public/test/unittest_test_suite.h" #include "content/test/content_test_suite.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "media/base/video_frame.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkTypes.h" #include "ui/gl/gl_implementation.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" @@ -44,7 +44,7 @@ namespace content { using blink::WebGLId; using blink::WebGraphicsContext3D; -using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; +using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl; content::GLHelper::ScalerQuality kQualities[] = { content::GLHelper::SCALER_QUALITY_BEST, diff --git a/content/common/gpu/client/gpu_in_process_context_tests.cc b/content/common/gpu/client/gpu_in_process_context_tests.cc index 3e134f5..6e74057 100644 --- a/content/common/gpu/client/gpu_in_process_context_tests.cc +++ b/content/common/gpu/client/gpu_in_process_context_tests.cc @@ -8,13 +8,13 @@ #include <vector> #include "content/public/test/unittest_test_suite.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gl/gl_surface.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace { -using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; +using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl; class ContextTestBase : public testing::Test { public: diff --git a/content/renderer/android/synchronous_compositor_factory.h b/content/renderer/android/synchronous_compositor_factory.h index 6eb6430..3ee74a0 100644 --- a/content/renderer/android/synchronous_compositor_factory.h +++ b/content/renderer/android/synchronous_compositor_factory.h @@ -19,10 +19,13 @@ class ContextProvider; class OutputSurface; } +namespace gpu_blink { +class WebGraphicsContext3DInProcessCommandBufferImpl; +} + namespace webkit { namespace gpu { class ContextProviderWebContext; -class WebGraphicsContext3DInProcessCommandBufferImpl; } } @@ -62,7 +65,7 @@ class SynchronousCompositorFactory { const std::string& debug_name) = 0; virtual scoped_refptr<StreamTextureFactory> CreateStreamTextureFactory( int frame_id) = 0; - virtual webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl* + virtual gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl* CreateOffscreenGraphicsContext3D( const blink::WebGraphicsContext3D::Attributes& attributes) = 0; diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index 9130436..2894dc6 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc @@ -84,7 +84,7 @@ #if defined(OS_ANDROID) #include "content/renderer/android/synchronous_compositor_factory.h" #include "content/renderer/media/android/audio_decoder_android.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #endif #if defined(OS_MACOSX) @@ -964,7 +964,7 @@ RendererBlinkPlatformImpl::createOffscreenGraphicsContext3D( #if defined(OS_ANDROID) if (SynchronousCompositorFactory* factory = SynchronousCompositorFactory::GetInstance()) { - scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl> + scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl> in_process_context( factory->CreateOffscreenGraphicsContext3D(attributes)); if (!in_process_context || diff --git a/gpu/blink/BUILD.gn b/gpu/blink/BUILD.gn index 3d0e77a..464061c 100644 --- a/gpu/blink/BUILD.gn +++ b/gpu/blink/BUILD.gn @@ -10,6 +10,8 @@ component("blink") { "gpu_blink_export.h", "webgraphicscontext3d_impl.cc", "webgraphicscontext3d_impl.h", + "webgraphicscontext3d_in_process_command_buffer_impl.cc", + "webgraphicscontext3d_in_process_command_buffer_impl.h", ] defines = [ "GPU_BLINK_IMPLEMENTATION" ] diff --git a/gpu/blink/gpu_blink.gyp b/gpu/blink/gpu_blink.gyp index a1d3cb5..06a7c12 100644 --- a/gpu/blink/gpu_blink.gyp +++ b/gpu/blink/gpu_blink.gyp @@ -35,6 +35,8 @@ 'gpu_blink_export.h', 'webgraphicscontext3d_impl.cc', 'webgraphicscontext3d_impl.h', + 'webgraphicscontext3d_in_process_command_buffer_impl.cc', + 'webgraphicscontext3d_in_process_command_buffer_impl.h', ], 'defines': [ 'GPU_BLINK_IMPLEMENTATION', diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc index 3bf38f8..386d349 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include <GLES2/gl2.h> #ifndef GL_GLEXT_PROTOTYPES @@ -27,8 +27,7 @@ using gpu::gles2::GLES2Implementation; using gpu::GLInProcessContext; -namespace webkit { -namespace gpu { +namespace gpu_blink { // static scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> @@ -176,5 +175,4 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() { } } -} // namespace gpu -} // namespace webkit +} // namespace gpu_blink diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h index 1779a5b..94816a8 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -2,22 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ -#define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ +#ifndef GPU_BLINK_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ +#define GPU_BLINK_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ #include <vector> #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" +#include "gpu/blink/gpu_blink_export.h" #include "gpu/blink/webgraphicscontext3d_impl.h" #include "gpu/command_buffer/client/gl_in_process_context.h" #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" #include "third_party/WebKit/public/platform/WebString.h" #include "ui/gfx/native_widget_types.h" -#include "webkit/common/gpu/webkit_gpu_export.h" namespace gpu { class ContextSupport; +class GLInProcessContext; namespace gles2 { class GLES2Interface; @@ -26,15 +27,10 @@ struct ContextCreationAttribHelper; } } -namespace gpu { -class GLInProcessContext; -} - -namespace webkit { -namespace gpu { +namespace gpu_blink { -class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl - : public gpu_blink::WebGraphicsContext3DImpl { +class GPU_BLINK_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl + : public WebGraphicsContext3DImpl { public: enum MappedMemoryReclaimLimit { kNoLimit = 0, @@ -104,7 +100,6 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl ::gpu::gles2::GLES2Implementation* real_gl_; }; -} // namespace gpu -} // namespace webkit +} // namespace gpu_blink -#endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ +#endif // GPU_BLINK_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn index 8461f75..047aa16 100644 --- a/ui/compositor/BUILD.gn +++ b/ui/compositor/BUILD.gn @@ -112,6 +112,7 @@ source_set("test_support") { "//cc", "//cc/surfaces", "//cc:test_support", + "//gpu/blink", "//skia", "//testing/gtest", "//third_party/WebKit/public:blink_minimal", diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 76cb687..6959709 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -90,6 +90,7 @@ '<(DEPTH)/cc/cc.gyp:cc', '<(DEPTH)/cc/cc.gyp:cc_surfaces', '<(DEPTH)/cc/cc_tests.gyp:cc_test_support', + '<(DEPTH)/gpu/blink/gpu_blink.gyp:gpu_blink', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', diff --git a/ui/compositor/test/DEPS b/ui/compositor/test/DEPS index c337a49..7f9b273 100644 --- a/ui/compositor/test/DEPS +++ b/ui/compositor/test/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+gpu/blink", "+gpu/command_buffer/client", "+webkit/common/gpu", ] diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc index 819f9e8..7dc5a4f 100644 --- a/ui/compositor/test/in_process_context_factory.cc +++ b/ui/compositor/test/in_process_context_factory.cc @@ -13,6 +13,7 @@ #include "cc/surfaces/surface_id_allocator.h" #include "cc/test/pixel_test_output_surface.h" #include "cc/test/test_shared_bitmap_manager.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "gpu/command_buffer/client/context_support.h" #include "gpu/command_buffer/client/gles2_interface.h" #include "ui/compositor/compositor_switches.h" @@ -21,7 +22,6 @@ #include "ui/gl/gl_surface.h" #include "webkit/common/gpu/context_provider_in_process.h" #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace ui { namespace { @@ -94,7 +94,7 @@ void InProcessContextFactory::CreateOutputSurface( attrs.shareResources = true; bool lose_context_when_out_of_memory = true; - using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; + using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl; scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d( WebGraphicsContext3DInProcessCommandBufferImpl::CreateViewContext( attrs, lose_context_when_out_of_memory, compositor->widget())); diff --git a/webkit/common/gpu/BUILD.gn b/webkit/common/gpu/BUILD.gn index d8a7e18..43e0a64 100644 --- a/webkit/common/gpu/BUILD.gn +++ b/webkit/common/gpu/BUILD.gn @@ -12,8 +12,6 @@ component("gpu") { "context_provider_web_context.h", "grcontext_for_webgraphicscontext3d.cc", "grcontext_for_webgraphicscontext3d.h", - "webgraphicscontext3d_in_process_command_buffer_impl.cc", - "webgraphicscontext3d_in_process_command_buffer_impl.h", ] defines = [ "WEBKIT_GPU_IMPLEMENTATION" ] diff --git a/webkit/common/gpu/context_provider_in_process.cc b/webkit/common/gpu/context_provider_in_process.cc index 9eb6e41..23fc066 100644 --- a/webkit/common/gpu/context_provider_in_process.cc +++ b/webkit/common/gpu/context_provider_in_process.cc @@ -14,6 +14,8 @@ #include "gpu/command_buffer/client/gles2_implementation.h" #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" +using gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl; + namespace webkit { namespace gpu { @@ -152,8 +154,7 @@ class GrContext* ContextProviderInProcess::GrContext() { if (gr_context_) return gr_context_->get(); - gr_context_.reset( - new webkit::gpu::GrContextForWebGraphicsContext3D(context3d_.get())); + gr_context_.reset(new GrContextForWebGraphicsContext3D(context3d_.get())); return gr_context_->get(); } diff --git a/webkit/common/gpu/context_provider_in_process.h b/webkit/common/gpu/context_provider_in_process.h index 2867309..0e38083 100644 --- a/webkit/common/gpu/context_provider_in_process.h +++ b/webkit/common/gpu/context_provider_in_process.h @@ -9,8 +9,8 @@ #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h" +#include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/common/gpu/context_provider_web_context.h" -#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/common/gpu/webkit_gpu_export.h" namespace blink { class WebGraphicsContext3D; } @@ -23,7 +23,8 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess : NON_EXPORTED_BASE(public ContextProviderWebContext) { public: static scoped_refptr<ContextProviderInProcess> Create( - scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d, + scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl> + context3d, const std::string& debug_name); // Uses default attributes for creating an offscreen context. @@ -49,7 +50,8 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess protected: ContextProviderInProcess( - scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context3d, + scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl> + context3d, const std::string& debug_name); ~ContextProviderInProcess() override; @@ -61,7 +63,7 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess base::ThreadChecker main_thread_checker_; base::ThreadChecker context_thread_checker_; - scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl> + scoped_ptr<gpu_blink::WebGraphicsContext3DInProcessCommandBufferImpl> context3d_; scoped_ptr<webkit::gpu::GrContextForWebGraphicsContext3D> gr_context_; diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp index 7a289ff..390aacc 100644 --- a/webkit/common/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp @@ -42,8 +42,6 @@ 'context_provider_web_context.h', 'grcontext_for_webgraphicscontext3d.cc', 'grcontext_for_webgraphicscontext3d.h', - 'webgraphicscontext3d_in_process_command_buffer_impl.cc', - 'webgraphicscontext3d_in_process_command_buffer_impl.h', ], 'defines': [ 'WEBKIT_GPU_IMPLEMENTATION', |