diff options
44 files changed, 87 insertions, 82 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 0cc2083..08d459b 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -76,7 +76,7 @@ '../skia/skia.gyp:skia', '../gpu/gpu.gyp:gles2_implementation', '../ui/gl/gl.gyp:gl', - '../webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 'android_webview_pak', ], 'include_dirs': [ diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc index f92aad7..9ee37738 100644 --- a/android_webview/browser/gpu_memory_buffer_impl.cc +++ b/android_webview/browser/gpu_memory_buffer_impl.cc @@ -9,7 +9,7 @@ #include "base/logging.h" #include "gpu/command_buffer/client/gpu_memory_buffer.h" #include "ui/gfx/size.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace android_webview { diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index 665bdb8..e659ce3 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -22,7 +22,7 @@ #include "content/public/browser/browser_main_runner.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/content_switches.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace android_webview { @@ -17,6 +17,4 @@ include_rules = [ "+third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h", "+third_party/WebKit/Source/Platform/chromium/public/WebGraphicsMemoryAllocation.h", "+third_party/WebKit/Source/Platform/chromium/public/WebLayerScrollClient.h", - # TODO(jamesr): Remove once cc depends on GLES2Interface instead of WGC3D - "+webkit/gpu", ] diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index cc7fc70..e9a4d02 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -178,7 +178,7 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../ui/ui.gyp:ui', - '../webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 'cc.gyp:cc', 'cc_test_support', 'cc_test_utils', diff --git a/cc/test/DEPS b/cc/test/DEPS index 73ee3d5..8a37ff9e 100644 --- a/cc/test/DEPS +++ b/cc/test/DEPS @@ -1,3 +1,5 @@ include_rules = [ "+ui/gl/", + # TODO(jamesr): Remove once cc depends on GLES2Interface instead of WGC3D + "+webkit/common/gpu", ] diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index 0489534..384eaec 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -11,8 +11,8 @@ #include "cc/test/pixel_test_utils.h" #include "cc/trees/layer_tree_impl.h" #include "ui/gl/gl_implementation.h" -#include "webkit/gpu/context_provider_in_process.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/context_provider_in_process.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace cc { diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc index 132dc3b..0885c76 100644 --- a/cc/test/pixel_test.cc +++ b/cc/test/pixel_test.cc @@ -16,8 +16,8 @@ #include "cc/test/pixel_test_utils.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gl/gl_implementation.h" -#include "webkit/gpu/context_provider_in_process.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/context_provider_in_process.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" namespace cc { diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index f14932b..a9b9a66 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -33,8 +33,8 @@ #include "third_party/khronos/GLES2/gl2.h" #include "third_party/khronos/GLES2/gl2ext.h" #include "ui/gfx/android/java_bitmap.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_impl.h" #include "webkit/glue/webthread_impl.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" namespace gfx { class JavaBitmap; diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc index bfb6dbb..212b69f 100644 --- a/content/browser/renderer_host/image_transport_factory_android.cc +++ b/content/browser/renderer_host/image_transport_factory_android.cc @@ -7,12 +7,12 @@ #include "base/memory/singleton.h" #include "content/browser/gpu/browser_gpu_channel_host_factory.h" #include "content/browser/renderer_host/compositor_impl_android.h" -#include "content/common/gpu/gpu_process_launch_causes.h" #include "content/common/gpu/client/gl_helper.h" #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" +#include "content/common/gpu/gpu_process_launch_causes.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/khronos/GLES2/gl2.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_impl.h" namespace content { diff --git a/content/common/gpu/client/context_provider_command_buffer.cc b/content/common/gpu/client/context_provider_command_buffer.cc index 84d6a50..a22fa0c 100644 --- a/content/common/gpu/client/context_provider_command_buffer.cc +++ b/content/common/gpu/client/context_provider_command_buffer.cc @@ -4,7 +4,7 @@ #include "content/common/gpu/client/context_provider_command_buffer.h" -#include "webkit/gpu/grcontext_for_webgraphicscontext3d.h" +#include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" namespace content { diff --git a/content/common/gpu/client/gl_helper_benchmark.cc b/content/common/gpu/client/gl_helper_benchmark.cc index 82356ec..a6efaed 100644 --- a/content/common/gpu/client/gl_helper_benchmark.cc +++ b/content/common/gpu/client/gl_helper_benchmark.cc @@ -31,8 +31,8 @@ #include "third_party/skia/include/core/SkTypes.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gl/gl_surface.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_impl.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" diff --git a/content/common/gpu/client/gl_helper_unittests.cc b/content/common/gpu/client/gl_helper_unittests.cc index 16fe939d..21a77f7 100644 --- a/content/common/gpu/client/gl_helper_unittests.cc +++ b/content/common/gpu/client/gl_helper_unittests.cc @@ -24,8 +24,8 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkTypes.h" #include "ui/gl/gl_surface.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_impl.h" #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc index ddb92d1..05454f8 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc @@ -14,16 +14,16 @@ #include <set> #include "base/bind.h" -#include "base/lazy_instance.h" #include "base/command_line.h" #include "base/debug/trace_event.h" +#include "base/lazy_instance.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/synchronization/lock.h" -#include "content/common/gpu/gpu_memory_allocation.h" #include "content/common/gpu/client/gpu_channel_host.h" +#include "content/common/gpu/gpu_memory_allocation.h" #include "content/common/gpu/gpu_process_launch_causes.h" #include "content/public/common/content_constants.h" #include "content/public/common/content_switches.h" @@ -37,7 +37,7 @@ #include "gpu/command_buffer/common/mailbox.h" #include "gpu/ipc/command_buffer_proxy.h" #include "third_party/skia/include/core/SkTypes.h" -#include "webkit/gpu/gl_bindings_skia_cmd_buffer.h" +#include "webkit/common/gpu/gl_bindings_skia_cmd_buffer.h" namespace content { static base::LazyInstance<base::Lock>::Leaky diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 4b81cba..4458e98 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -16,9 +16,9 @@ '../ui/native_theme/native_theme.gyp:native_theme', '../ui/surface/surface.gyp:surface', '../v8/tools/gyp/v8.gyp:v8', + '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings', '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', - '../webkit/gpu/webkit_gpu.gyp:webkit_gpu', '../webkit/support/webkit_support.gyp:glue', '../webkit/support/webkit_support.gyp:glue_common', '../webkit/support/webkit_support.gyp:plugins', diff --git a/content/content_tests.gypi b/content/content_tests.gypi index fcfe651..68e8ca9 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -171,7 +171,7 @@ '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '../third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner', '../ui/surface/surface.gyp:surface', - '../webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', '../webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', '../webkit/support/webkit_support.gyp:webkit_storage', '../webkit/support/webkit_support.gyp:webkit_support_common', diff --git a/content/renderer/android/synchronous_compositor_output_surface.cc b/content/renderer/android/synchronous_compositor_output_surface.cc index d0ddf4d..ad22021 100644 --- a/content/renderer/android/synchronous_compositor_output_surface.cc +++ b/content/renderer/android/synchronous_compositor_output_surface.cc @@ -22,7 +22,7 @@ #include "ui/gfx/rect_conversions.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/transform.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index bcdad30..1210964 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -49,11 +49,11 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" #include "webkit/base/file_path_string_conversions.h" +#include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webfileutilities_impl.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/gpu/webgraphicscontext3d_provider_impl.h" #if defined(OS_WIN) #include "content/common/child_process_messages.h" diff --git a/ui/compositor/DEPS b/ui/compositor/DEPS index 95ad49f..7dbb84f 100644 --- a/ui/compositor/DEPS +++ b/ui/compositor/DEPS @@ -3,8 +3,9 @@ # Compositor out of WebKit. include_rules = [ "+cc", - "+third_party/WebKit/Source/Platform/chromium/public", - "+third_party/WebKit/Source/WebKit/chromium/public", - "+webkit/glue", - "+webkit/gpu", + "+third_party/WebKit/Source/Platform/chromium/public/WebFilterOperation.h", + "+third_party/WebKit/Source/Platform/chromium/public/WebFilterOperations.h", + "+third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h", + "+third_party/WebKit/Source/Platform/chromium/public/WebString.h", + "+webkit/common/gpu", ] diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index a8306fe..d605478 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -32,8 +32,8 @@ #include "ui/gl/gl_implementation.h" #include "ui/gl/gl_surface.h" #include "ui/gl/gl_switches.h" -#include "webkit/gpu/grcontext_for_webgraphicscontext3d.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #if defined(OS_CHROMEOS) #include "base/chromeos/chromeos_version.h" diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 464c43d..226b2c4 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -18,7 +18,7 @@ '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', - '<(DEPTH)/webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', ], 'defines': [ 'COMPOSITOR_IMPLEMENTATION', diff --git a/ui/compositor/test/DEPS b/ui/compositor/test/DEPS new file mode 100644 index 0000000..e85ba2d --- /dev/null +++ b/ui/compositor/test/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+third_party/WebKit/Source/WebKit/chromium/public", + "+webkit/glue", +] diff --git a/webkit/gpu/OWNERS b/webkit/common/gpu/OWNERS index 461a3b1..461a3b1 100644 --- a/webkit/gpu/OWNERS +++ b/webkit/common/gpu/OWNERS diff --git a/webkit/gpu/context_provider_in_process.cc b/webkit/common/gpu/context_provider_in_process.cc index a8855ab..1545d3a 100644 --- a/webkit/gpu/context_provider_in_process.cc +++ b/webkit/common/gpu/context_provider_in_process.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/gpu/context_provider_in_process.h" +#include "webkit/common/gpu/context_provider_in_process.h" -#include "webkit/gpu/grcontext_for_webgraphicscontext3d.h" +#include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" namespace webkit { namespace gpu { diff --git a/webkit/gpu/context_provider_in_process.h b/webkit/common/gpu/context_provider_in_process.h index fd9c5f0..c863697 100644 --- a/webkit/gpu/context_provider_in_process.h +++ b/webkit/common/gpu/context_provider_in_process.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ -#define WEBKIT_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ +#ifndef WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ +#define WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/synchronization/lock.h" #include "cc/output/context_provider.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" -#include "webkit/gpu/webkit_gpu_export.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webkit_gpu_export.h" namespace webkit { namespace gpu { @@ -61,4 +61,4 @@ class WEBKIT_GPU_EXPORT ContextProviderInProcess } // namespace gpu } // namespace webkit -#endif // WEBKIT_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ +#endif // WEBKIT_COMMON_GPU_CONTEXT_PROVIDER_IN_PROCESS_H_ diff --git a/webkit/gpu/gl_bindings_skia_cmd_buffer.cc b/webkit/common/gpu/gl_bindings_skia_cmd_buffer.cc index 53e98f1..689df58 100644 --- a/webkit/gpu/gl_bindings_skia_cmd_buffer.cc +++ b/webkit/common/gpu/gl_bindings_skia_cmd_buffer.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/gpu/gl_bindings_skia_cmd_buffer.h" +#include "webkit/common/gpu/gl_bindings_skia_cmd_buffer.h" #ifndef GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES diff --git a/webkit/gpu/gl_bindings_skia_cmd_buffer.h b/webkit/common/gpu/gl_bindings_skia_cmd_buffer.h index 9ace2c1..39b4e4e 100644 --- a/webkit/gpu/gl_bindings_skia_cmd_buffer.h +++ b/webkit/common/gpu/gl_bindings_skia_cmd_buffer.h @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_GL_BINDINGS_SKIA_CMD_BUFFER_H_ -#define WEBKIT_GPU_GL_BINDINGS_SKIA_CMD_BUFFER_H_ +#ifndef WEBKIT_COMMON_GPU_GL_BINDINGS_SKIA_CMD_BUFFER_H_ +#define WEBKIT_COMMON_GPU_GL_BINDINGS_SKIA_CMD_BUFFER_H_ -#include "webkit/gpu/webkit_gpu_export.h" +#include "webkit/common/gpu/webkit_gpu_export.h" struct GrGLInterface; @@ -19,4 +19,4 @@ WEBKIT_GPU_EXPORT GrGLInterface* CreateCommandBufferSkiaGLBinding(); } // namespace gpu } // namespace webkit -#endif // WEBKIT_GLUE_GL_BINDINGS_SKIA_CMD_BUFFER_H_ +#endif // WEBKIT_COMMON_GPU_GL_BINDINGS_SKIA_CMD_BUFFER_H_ diff --git a/webkit/gpu/grcontext_for_webgraphicscontext3d.cc b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.cc index a1d3abd..c1e9a20 100644 --- a/webkit/gpu/grcontext_for_webgraphicscontext3d.cc +++ b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.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/gpu/grcontext_for_webgraphicscontext3d.h" +#include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/skia/include/gpu/GrContext.h" diff --git a/webkit/gpu/grcontext_for_webgraphicscontext3d.h b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.h index 6b7feed..536adad 100644 --- a/webkit/gpu/grcontext_for_webgraphicscontext3d.h +++ b/webkit/common/gpu/grcontext_for_webgraphicscontext3d.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ -#define WEBKIT_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ +#ifndef WEBKIT_COMMON_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ +#define WEBKIT_COMMON_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ #include "base/basictypes.h" #include "skia/ext/refptr.h" -#include "webkit/gpu/webkit_gpu_export.h" +#include "webkit/common/gpu/webkit_gpu_export.h" class GrContext; namespace WebKit { class WebGraphicsContext3D; } @@ -37,4 +37,4 @@ class WEBKIT_GPU_EXPORT GrContextForWebGraphicsContext3D { } // namespace gpu } // namespace webkit -#endif // WEBKIT_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ +#endif // WEBKIT_COMMON_GPU_GRCONTEXT_FOR_WEBGRAPHICSCONTEXT3D_H_ diff --git a/webkit/gpu/test_context_provider_factory.cc b/webkit/common/gpu/test_context_provider_factory.cc index a8ac73b..69ae385 100644 --- a/webkit/gpu/test_context_provider_factory.cc +++ b/webkit/common/gpu/test_context_provider_factory.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "webkit/gpu/test_context_provider_factory.h" +#include "webkit/common/gpu/test_context_provider_factory.h" #include "base/logging.h" #include "cc/output/context_provider.h" -#include "webkit/gpu/context_provider_in_process.h" +#include "webkit/common/gpu/context_provider_in_process.h" namespace webkit { namespace gpu { diff --git a/webkit/gpu/test_context_provider_factory.h b/webkit/common/gpu/test_context_provider_factory.h index b173daf..2ffea99 100644 --- a/webkit/gpu/test_context_provider_factory.h +++ b/webkit/common/gpu/test_context_provider_factory.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_ -#define WEBKIT_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_ +#ifndef WEBKIT_COMMON_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_ +#define WEBKIT_COMMON_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_ #include "base/memory/ref_counted.h" -#include "webkit/gpu/webkit_gpu_export.h" +#include "webkit/common/gpu/webkit_gpu_export.h" namespace cc { class ContextProvider; @@ -38,4 +38,4 @@ class WEBKIT_GPU_EXPORT TestContextProviderFactory { } // namespace gpu } // namespace webkit -#endif // WEBKIT_GPU_TEST_WEBKIT_CONTEXT_PROVIDER_FACTORY_H_ +#endif // WEBKIT_COMMON_GPU_TEST_CONTEXT_PROVIDER_FACTORY_H_ diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 5235e22..e555d20 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/common/gpu/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/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include <GLES2/gl2.h> #ifndef GL_GLEXT_PROTOTYPES @@ -40,7 +40,7 @@ #include "ui/gl/gl_image.h" #include "ui/gl/gl_share_group.h" #include "ui/gl/gl_surface.h" -#include "webkit/gpu/gl_bindings_skia_cmd_buffer.h" +#include "webkit/common/gpu/gl_bindings_skia_cmd_buffer.h" using gpu::Buffer; using gpu::CommandBuffer; diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index cf06e8e..6e2beef 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ -#define WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ +#ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ +#define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ #if defined(ENABLE_GPU) @@ -15,7 +15,7 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "ui/gfx/native_widget_types.h" -#include "webkit/gpu/webkit_gpu_export.h" +#include "webkit/common/gpu/webkit_gpu_export.h" namespace gpu { namespace gles2 { @@ -607,4 +607,4 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessCommandBufferImpl } // namespace webkit #endif // defined(ENABLE_GPU) -#endif // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ +#endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_COMMAND_BUFFER_IMPL_H_ diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.cc index b5ef5ca..3129947 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_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/gpu/webgraphicscontext3d_in_process_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_impl.h" #include <string.h> diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h index 8187302..a631c29 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_impl.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ -#define WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ +#ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ +#define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ #include <list> #include <set> @@ -15,7 +15,7 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" #include "third_party/angle/include/GLSLANG/ShaderLang.h" #include "ui/gfx/native_widget_types.h" -#include "webkit/gpu/webkit_gpu_export.h" +#include "webkit/common/gpu/webkit_gpu_export.h" namespace gfx { class GLContext; @@ -574,4 +574,4 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DInProcessImpl : } // namespace gpu } // namespace webkit -#endif // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ +#endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_IN_PROCESS_IMPL_H_ diff --git a/webkit/gpu/webgraphicscontext3d_provider_impl.cc b/webkit/common/gpu/webgraphicscontext3d_provider_impl.cc index 00f4391..c4a94c1 100644 --- a/webkit/gpu/webgraphicscontext3d_provider_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_provider_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/gpu/webgraphicscontext3d_provider_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" #include "cc/output/context_provider.h" diff --git a/webkit/gpu/webgraphicscontext3d_provider_impl.h b/webkit/common/gpu/webgraphicscontext3d_provider_impl.h index 921dd52..8dc28e8 100644 --- a/webkit/gpu/webgraphicscontext3d_provider_impl.h +++ b/webkit/common/gpu/webgraphicscontext3d_provider_impl.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_ -#define WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_ +#ifndef WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_ +#define WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_ #include "base/compiler_specific.h" #include "base/memory/ref_counted.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3DProvider.h" -#include "webkit/gpu/webkit_gpu_export.h" +#include "webkit/common/gpu/webkit_gpu_export.h" namespace cc { class ContextProvider; } @@ -33,4 +33,4 @@ class WEBKIT_GPU_EXPORT WebGraphicsContext3DProviderImpl } // namespace gpu } // namespace webkit -#endif // WEBKIT_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_ +#endif // WEBKIT_COMMON_GPU_WEBGRAPHICSCONTEXT3D_PROVIDER_IMPL_H_ diff --git a/webkit/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp index f7c8b93..f7c8b93 100644 --- a/webkit/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp diff --git a/webkit/gpu/webkit_gpu_export.h b/webkit/common/gpu/webkit_gpu_export.h index 486f78e..2fb0c95 100644 --- a/webkit/gpu/webkit_gpu_export.h +++ b/webkit/common/gpu/webkit_gpu_export.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef WEBKIT_GPU_WEBKIT_GPU_EXPORT_H_ -#define WEBKIT_GPU_WEBKIT_GPU_EXPORT_H_ +#ifndef WEBKIT_COMMON_GPU_WEBKIT_GPU_EXPORT_H_ +#define WEBKIT_COMMON_GPU_WEBKIT_GPU_EXPORT_H_ #if defined(COMPONENT_BUILD) #if defined(WIN32) @@ -26,4 +26,4 @@ #define WEBKIT_GPU_EXPORT #endif -#endif // WEBKIT_GPU_WEBKIT_GPU_EXPORT_H_ +#endif // WEBKIT_COMMON_GPU_WEBKIT_GPU_EXPORT_H_ diff --git a/webkit/renderer/compositor_bindings/compositor_bindings.gyp b/webkit/renderer/compositor_bindings/compositor_bindings.gyp index 424b288a..a226887 100644 --- a/webkit/renderer/compositor_bindings/compositor_bindings.gyp +++ b/webkit/renderer/compositor_bindings/compositor_bindings.gyp @@ -65,7 +65,7 @@ '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', '<(DEPTH)/ui/ui.gyp:ui', - '<(DEPTH)/webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', ], 'sources': [ '<@(webkit_compositor_bindings_sources)', diff --git a/webkit/support/test_webkit_platform_support.cc b/webkit/support/test_webkit_platform_support.cc index 02ad09c..24f5c7a 100644 --- a/webkit/support/test_webkit_platform_support.cc +++ b/webkit/support/test_webkit_platform_support.cc @@ -33,13 +33,13 @@ #include "v8/include/v8.h" #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/browser/database/vfs_backend.h" +#include "webkit/common/gpu/test_context_provider_factory.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" +#include "webkit/common/gpu/webgraphicscontext3d_provider_impl.h" #include "webkit/glue/simple_webmimeregistry_impl.h" #include "webkit/glue/webclipboard_impl.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitplatformsupport_impl.h" -#include "webkit/gpu/test_context_provider_factory.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" -#include "webkit/gpu/webgraphicscontext3d_provider_impl.h" #include "webkit/plugins/npapi/plugin_list.h" #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h" #include "webkit/support/gc_extension.h" diff --git a/webkit/support/web_layer_tree_view_impl_for_testing.cc b/webkit/support/web_layer_tree_view_impl_for_testing.cc index b0c5112..77d8346 100644 --- a/webkit/support/web_layer_tree_view_impl_for_testing.cc +++ b/webkit/support/web_layer_tree_view_impl_for_testing.cc @@ -23,7 +23,7 @@ #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeView.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebRenderingStats.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" -#include "webkit/gpu/test_context_provider_factory.h" +#include "webkit/common/gpu/test_context_provider_factory.h" #include "webkit/renderer/compositor_bindings/web_layer_impl.h" #include "webkit/support/test_webkit_platform_support.h" diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc index e9be6f7..b369a5a 100644 --- a/webkit/support/webkit_support.cc +++ b/webkit/support/webkit_support.cc @@ -53,14 +53,14 @@ #include "webkit/appcache/web_application_cache_host_impl.h" #include "webkit/base/file_path_string_conversions.h" #include "webkit/browser/fileapi/isolated_context.h" +#include "webkit/common/gpu/test_context_provider_factory.h" +#include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/common/user_agent/user_agent.h" #include "webkit/common/user_agent/user_agent_util.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webkitplatformsupport_impl.h" #include "webkit/glue/webthread_impl.h" #include "webkit/glue/weburlrequest_extradata_impl.h" -#include "webkit/gpu/test_context_provider_factory.h" -#include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" #include "webkit/media/media_stream_client.h" #include "webkit/media/webmediaplayer_impl.h" #include "webkit/media/webmediaplayer_ms.h" diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi index a8494e0..c5b8722 100644 --- a/webkit/support/webkit_support.gypi +++ b/webkit/support/webkit_support.gypi @@ -24,7 +24,7 @@ '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:shell_dialogs', '<(DEPTH)/ui/ui.gyp:ui', - '<(DEPTH)/webkit/gpu/webkit_gpu.gyp:webkit_gpu', + '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_bindings', '<(DEPTH)/webkit/renderer/compositor_bindings/compositor_bindings.gyp:webkit_compositor_support', 'glue', |