Permalink
Browse files

ui: Move surface/ directory out of gfx/, up to ui/.

BUG=104040
R=ben@chromium.org
TBR=brettw@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10351002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135232 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information...
tfarina@chromium.org
tfarina@chromium.org committed May 3, 2012
1 parent 8a879cd commit 40aafd29952b3b254df8b6b38e2f8dd8e25b6f4d
Showing with 127 additions and 127 deletions.
  1. +1 −1 chrome/browser/tab_contents/thumbnail_generator_unittest.cc
  2. +1 −1 chrome/chrome_browser.gypi
  3. +1 −1 chrome/chrome_renderer.gypi
  4. +2 −2 chrome/renderer/nacl_desc_wrapper_chrome.cc
  5. +1 −1 chrome/test/gpu/gpu_feature_browsertest.cc
  6. +1 −0 content/DEPS
  7. +1 −1 content/browser/gpu/gpu_process_host.cc
  8. +1 −1 content/browser/renderer_host/accelerated_surface_container_mac.cc
  9. +1 −1 content/browser/renderer_host/accelerated_surface_container_mac.h
  10. +1 −1 content/browser/renderer_host/accelerated_surface_container_manager_mac.h
  11. +2 −2 content/browser/renderer_host/backing_store.h
  12. +4 −4 content/browser/renderer_host/backing_store_gtk.cc
  13. +1 −1 content/browser/renderer_host/backing_store_mac.mm
  14. +2 −2 content/browser/renderer_host/backing_store_manager.h
  15. +1 −1 content/browser/renderer_host/backing_store_win.cc
  16. +1 −1 content/browser/renderer_host/compositing_iosurface_mac.mm
  17. +1 −1 content/browser/renderer_host/image_transport_client.h
  18. +1 −1 content/browser/renderer_host/render_message_filter.h
  19. +1 −1 content/browser/renderer_host/render_process_host_impl.h
  20. +1 −1 content/browser/renderer_host/render_widget_helper.h
  21. +2 −2 content/browser/renderer_host/render_widget_host_view_mac.mm
  22. +1 −1 content/browser/renderer_host/render_widget_host_view_win.h
  23. +4 −4 content/browser/web_contents/web_contents_impl.cc
  24. +3 −3 content/common/gpu/gpu_command_buffer_stub.h
  25. +2 −2 content/common/gpu/gpu_messages.h
  26. +1 −1 content/common/gpu/image_transport_surface.h
  27. +2 −2 content/common/gpu/image_transport_surface_mac.cc
  28. +1 −1 content/content_browser.gypi
  29. +1 −1 content/content_renderer.gypi
  30. +1 −1 content/content_tests.gypi
  31. +4 −4 content/plugin/webplugin_accelerated_surface_proxy_mac.cc
  32. +1 −1 content/plugin/webplugin_proxy.h
  33. +1 −1 content/port/browser/render_widget_host_view_port.h
  34. +1 −1 content/public/browser/render_process_host.h
  35. +1 −1 content/public/browser/render_widget_host.h
  36. +1 −1 content/public/common/common_param_traits.h
  37. +1 −1 content/renderer/pepper/pepper_platform_image_2d_impl.cc
  38. +4 −4 content/renderer/render_process_impl.cc
  39. +4 −4 content/renderer/render_view_impl.h
  40. +6 −6 content/renderer/render_widget.cc
  41. +2 −2 content/renderer/render_widget.h
  42. +2 −2 content/renderer/webplugin_delegate_proxy.h
  43. +1 −1 content/test/mock_render_process.cc
  44. +1 −1 content/test/render_widget_browsertest.cc
  45. +1 −0 gpu/DEPS
  46. +1 −1 gpu/command_buffer/service/feature_info.cc
  47. +2 −2 gpu/command_buffer/service/gles2_cmd_decoder.cc
  48. +1 −1 gpu/command_buffer_service.gypi
  49. +1 −1 ppapi/ppapi_proxy.gypi
  50. +1 −1 ppapi/ppapi_shared.gypi
  51. +1 −1 ppapi/ppapi_tests.gypi
  52. +1 −1 ppapi/proxy/DEPS
  53. +1 −1 ppapi/proxy/ppb_image_data_proxy.cc
  54. +0 −1 ui/{gfx → }/surface/OWNERS
  55. +3 −3 ui/{gfx → }/surface/accelerated_surface_mac.cc
  56. +6 −6 ui/{gfx → }/surface/accelerated_surface_mac.h
  57. +3 −3 ui/{gfx → }/surface/accelerated_surface_win.cc
  58. +4 −4 ui/{gfx → }/surface/accelerated_surface_win.h
  59. +2 −2 ui/{gfx → }/surface/io_surface_support_mac.cc
  60. +5 −6 ui/{gfx → }/surface/io_surface_support_mac.h
  61. +1 −1 ui/{gfx → }/surface/surface.gyp
  62. +4 −4 ui/{gfx → }/surface/surface_export.h
  63. +5 −5 ui/{gfx → }/surface/transport_dib.h
  64. +3 −3 ui/{gfx → }/surface/transport_dib_android.cc
  65. +2 −2 ui/{gfx → }/surface/transport_dib_linux.cc
  66. +3 −3 ui/{gfx → }/surface/transport_dib_mac.cc
  67. +2 −2 ui/{gfx → }/surface/transport_dib_win.cc
@@ -16,7 +16,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColorPriv.h"
#include "ui/gfx/canvas.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
using content::WebContents;
@@ -52,7 +52,7 @@
'../third_party/libxml/libxml.gyp:libxml',
'../third_party/npapi/npapi.gyp:npapi',
'../ui/base/strings/ui_strings.gyp:ui_strings',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
'../ui/ui.gyp:ui_resources_2x',
@@ -27,7 +27,7 @@
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/smhasher/smhasher.gyp:murmurhash3',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
'../webkit/support/webkit_support.gyp:glue',
'../webkit/support/webkit_support.gyp:webkit_gpu',
'../webkit/support/webkit_support.gyp:webkit_media',
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,7 +7,7 @@
#include "native_client/src/trusted/desc/nacl_desc_base.h"
#include "native_client/src/trusted/desc/nacl_desc_sync_socket.h"
#include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
namespace nacl {
@@ -23,7 +23,7 @@
#include "net/base/net_util.h"
#include "ui/gfx/gl/gl_switches.h"
#if defined(OS_MACOSX)
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
#endif
using content::GpuDataManager;
View
@@ -53,6 +53,7 @@ include_rules = [
"+ui/aura",
"+ui/base",
"+ui/gfx",
+ "+ui/surface",
# Content knows about grd files, but the specifics of how to get a resource
# given its id is left to the embedder.
"-ui/base/l10n",
@@ -42,7 +42,7 @@
#endif
#if defined(OS_WIN) && !defined(USE_AURA)
-#include "ui/gfx/surface/accelerated_surface_win.h"
+#include "ui/surface/accelerated_surface_win.h"
#endif
using content::BrowserThread;
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "content/browser/renderer_host/accelerated_surface_container_manager_mac.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
#include "webkit/plugins/npapi/webplugin.h"
AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac(
@@ -34,7 +34,7 @@
#include "base/memory/scoped_ptr.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
namespace webkit {
namespace npapi {
@@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/synchronization/lock.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
namespace gfx {
class Rect;
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -12,7 +12,7 @@
#include "base/callback_forward.h"
#include "content/common/content_export.h"
#include "ui/gfx/size.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
class RenderProcessHost;
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -16,9 +16,9 @@
#endif
#include <algorithm>
-#include <utility>
#include <limits>
#include <queue>
+#include <utility>
#include "base/compiler_specific.h"
#include "base/logging.h"
@@ -28,11 +28,11 @@
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/base/gtk/gtk_signal.h"
#include "ui/base/x/x11_util.h"
#include "ui/base/x/x11_util_internal.h"
-#include "ui/base/gtk/gtk_signal.h"
#include "ui/gfx/rect.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
using content::RenderWidgetHost;
@@ -17,7 +17,7 @@
#include "third_party/skia/include/core/SkCanvas.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/scoped_cg_context_save_gstate_mac.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
// Mac Backing Stores:
//
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -13,7 +13,7 @@
#include "base/process.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
class BackingStore;
@@ -10,7 +10,7 @@
#include "content/public/common/content_switches.h"
#include "skia/ext/platform_canvas.h"
#include "ui/gfx/gdi_util.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
namespace {
@@ -14,7 +14,7 @@
#include "ui/gfx/gl/gl_context.h"
#include "ui/gfx/gl/gl_switches.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
#ifdef NDEBUG
#define CHECK_GL_ERROR()
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "ui/gfx/compositor/compositor.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
namespace gfx {
class Size;
@@ -24,7 +24,7 @@
#include "media/base/channel_layout.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
#if defined(OS_MACOSX)
#include "content/common/mac/font_loader.h"
@@ -18,7 +18,7 @@
#include "content/common/content_export.h"
#include "content/public/browser/render_process_host.h"
#include "ipc/ipc_channel_proxy.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
class CommandLine;
class GpuMessageFilter;
@@ -20,7 +20,7 @@
#include "content/public/common/window_container_type.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
namespace IPC {
class Message;
@@ -9,8 +9,8 @@
#include "base/bind.h"
#include "base/debug/trace_event.h"
#include "base/logging.h"
-#include "base/mac/mac_util.h"
#include "base/mac/closure_blocks_leopard_compat.h"
+#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#import "base/mac/scoped_nsautorelease_pool.h"
#import "base/memory/scoped_nsobject.h"
@@ -49,7 +49,7 @@
#import "ui/base/cocoa/underlay_opengl_hosting_window.h"
#include "ui/gfx/point.h"
#include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
#include "webkit/glue/webaccessibility.h"
#include "webkit/plugins/npapi/webplugin.h"
@@ -27,8 +27,8 @@
#include "ui/base/win/ime_input.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/point.h"
-#include "ui/gfx/surface/accelerated_surface_win.h"
#include "ui/gfx/sys_color_change_listener.h"
+#include "ui/surface/accelerated_surface_win.h"
#include "webkit/glue/webcursor.h"
class BackingStore;
@@ -58,14 +58,14 @@
#include "content/public/common/content_restriction.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
-#include "ui/base/ui_base_switches.h"
-#include "ui/gfx/monitor.h"
-#include "ui/gfx/screen.h"
#include "net/base/mime_util.h"
#include "net/base/net_util.h"
#include "net/base/network_change_notifier.h"
#include "net/url_request/url_request_context_getter.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
+#include "ui/base/ui_base_switches.h"
+#include "ui/gfx/monitor.h"
+#include "ui/gfx/screen.h"
#include "webkit/glue/web_intent_data.h"
#include "webkit/glue/webpreferences.h"
@@ -77,7 +77,7 @@
#include "content/browser/web_contents/web_contents_view_gtk.h"
#elif defined(OS_MACOSX)
#include "content/browser/web_contents/web_contents_view_mac.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
#elif defined(OS_ANDROID)
#include "content/browser/web_contents/web_contents_view_android.h"
#endif
@@ -16,8 +16,8 @@
#include "base/observer_list.h"
#include "content/common/content_export.h"
#include "content/common/gpu/gpu_memory_allocation.h"
-#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
#include "content/common/gpu/gpu_memory_allocation.h"
+#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
#include "gpu/command_buffer/common/constants.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
#include "gpu/command_buffer/service/context_group.h"
@@ -29,10 +29,10 @@
#include "ui/gfx/gl/gpu_preference.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
#if defined(OS_MACOSX)
-#include "ui/gfx/surface/accelerated_surface_mac.h"
+#include "ui/surface/accelerated_surface_mac.h"
#endif
class GpuChannel;
@@ -5,8 +5,8 @@
// Multiply-included message file, hence no include guard here, but see below
// for a much smaller-than-usual include guard section.
-#include <vector>
#include <string>
+#include <vector>
#include "base/shared_memory.h"
#include "content/common/content_export.h"
@@ -23,7 +23,7 @@
#include "ui/gfx/gl/gpu_preference.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/size.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
#define IPC_MESSAGE_START GpuMsgStart
@@ -21,7 +21,7 @@
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/size.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
class GpuChannelManager;
class GpuCommandBufferStub;
@@ -9,12 +9,12 @@
#include "base/mac/scoped_cftyperef.h"
#include "base/memory/scoped_ptr.h"
#include "content/common/gpu/gpu_messages.h"
-#include "ui/gfx/gl/gl_context.h"
#include "ui/gfx/gl/gl_bindings.h"
+#include "ui/gfx/gl/gl_context.h"
#include "ui/gfx/gl/gl_implementation.h"
#include "ui/gfx/gl/gl_surface_cgl.h"
#include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
namespace {
@@ -15,7 +15,7 @@
'../third_party/speex/speex.gyp:libspeex',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/zlib/zlib.gyp:zlib',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:ui',
'../ui/ui.gyp:ui_resources',
'../webkit/support/webkit_support.gyp:dom_storage',
@@ -16,7 +16,7 @@
'../third_party/libjingle/libjingle.gyp:libjingle_p2p',
'../third_party/npapi/npapi.gyp:npapi',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/support/webkit_support.gyp:webkit_media',
'../webkit/support/webkit_support.gyp:webkit_gpu',
@@ -17,7 +17,7 @@
'../testing/gtest.gyp:gtest',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- '../ui/gfx/surface/surface.gyp:surface',
+ '../ui/surface/surface.gyp:surface',
'../ui/ui.gyp:ui_test_support',
'../webkit/support/webkit_support.gyp:appcache',
],
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -10,9 +10,9 @@
#include "base/command_line.h"
#include "content/plugin/webplugin_proxy.h"
#include "ui/base/ui_base_switches.h"
-#include "ui/gfx/surface/accelerated_surface_mac.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/accelerated_surface_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
+#include "ui/surface/transport_dib.h"
WebPluginAcceleratedSurfaceProxy* WebPluginAcceleratedSurfaceProxy::Create(
WebPluginProxy* plugin_proxy,
@@ -24,7 +24,7 @@
#include "ui/base/x/x11_util.h"
#endif
#include "ui/gfx/gl/gpu_preference.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
#include "webkit/plugins/npapi/webplugin.h"
class PluginChannel;
Oops, something went wrong.

0 comments on commit 40aafd2

Please sign in to comment.