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 /ui | |
| 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}
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/compositor/BUILD.gn | 1 | ||||
| -rw-r--r-- | ui/compositor/compositor.gyp | 1 | ||||
| -rw-r--r-- | ui/compositor/test/DEPS | 1 | ||||
| -rw-r--r-- | ui/compositor/test/in_process_context_factory.cc | 4 |
4 files changed, 5 insertions, 2 deletions
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())); |