diff options
| author | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:47:15 +0000 |
|---|---|---|
| committer | nduca@chromium.org <nduca@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 21:47:15 +0000 |
| commit | 71a98539b82684a30ec658440c856b4fdef0d35d (patch) | |
| tree | 8d419ca8c2f29e7bdfedf3226f46eb0e9c961da3 /content | |
| parent | 2939c6cb4296a6e9a0692dbef28da5240f208add (diff) | |
| download | chromium_src-71a98539b82684a30ec658440c856b4fdef0d35d.zip chromium_src-71a98539b82684a30ec658440c856b4fdef0d35d.tar.gz chromium_src-71a98539b82684a30ec658440c856b4fdef0d35d.tar.bz2 | |
Move gpu_rendering_stats to content/common/gpu
R=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10915147
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/gpu/gpu_messages.h | 2 | ||||
| -rw-r--r-- | content/common/gpu/gpu_rendering_stats.cc (renamed from content/public/common/gpu_rendering_stats.cc) | 2 | ||||
| -rw-r--r-- | content/common/gpu/gpu_rendering_stats.h (renamed from content/public/common/gpu_rendering_stats.h) | 4 | ||||
| -rw-r--r-- | content/content_common.gypi | 4 | ||||
| -rw-r--r-- | content/renderer/gpu/gpu_benchmarking_extension.cc | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h index 9497e29..779ed9f 100644 --- a/content/common/gpu/gpu_messages.h +++ b/content/common/gpu/gpu_messages.h @@ -12,10 +12,10 @@ #include "content/common/content_export.h" #include "content/common/gpu/gpu_memory_allocation.h" #include "content/common/gpu/gpu_process_launch_causes.h" +#include "content/common/gpu/gpu_rendering_stats.h" #include "content/public/common/common_param_traits.h" #include "content/public/common/gpu_info.h" #include "content/public/common/gpu_memory_stats.h" -#include "content/public/common/gpu_rendering_stats.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/constants.h" #include "gpu/ipc/gpu_command_buffer_traits.h" diff --git a/content/public/common/gpu_rendering_stats.cc b/content/common/gpu/gpu_rendering_stats.cc index bbe38b9..18e9ec7 100644 --- a/content/public/common/gpu_rendering_stats.cc +++ b/content/common/gpu/gpu_rendering_stats.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 "content/public/common/gpu_rendering_stats.h" +#include "content/common/gpu/gpu_rendering_stats.h" namespace content { diff --git a/content/public/common/gpu_rendering_stats.h b/content/common/gpu/gpu_rendering_stats.h index 358f916..e7cad91 100644 --- a/content/public/common/gpu_rendering_stats.h +++ b/content/common/gpu/gpu_rendering_stats.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 CONTENT_PUBLIC_COMMON_RENDERING_STATS_H_ -#define CONTENT_PUBLIC_COMMON_RENDERING_STATS_H_ +#ifndef CONTENT_COMMON_GPU_GPU_RENDERING_STATS_H_ +#define CONTENT_COMMON_GPU_GPU_RENDERING_STATS_H_ #include "base/time.h" #include "content/common/content_export.h" diff --git a/content/content_common.gypi b/content/content_common.gypi index 77bf7f6..62c240b 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -64,8 +64,6 @@ 'public/common/gpu_memory_stats.cc', 'public/common/gpu_memory_stats.h', 'public/common/gpu_performance_stats.h', - 'public/common/gpu_rendering_stats.cc', - 'public/common/gpu_rendering_stats.h', 'public/common/injection_test_mac.h', 'public/common/injection_test_win.h', 'public/common/javascript_message_type.h', @@ -226,6 +224,8 @@ 'common/gpu/gpu_memory_tracking.h', 'common/gpu/gpu_messages.h', 'common/gpu/gpu_process_launch_causes.h', + 'common/gpu/gpu_rendering_stats.cc', + 'common/gpu/gpu_rendering_stats.h', 'common/gpu/gpu_surface_lookup.h', 'common/gpu/gpu_surface_lookup.cc', 'common/gpu/stream_texture_manager_android.cc', diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 087b435..b7fd7c9 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -10,7 +10,7 @@ #include "base/file_util.h" #include "base/memory/scoped_vector.h" #include "base/string_number_conversions.h" -#include "content/public/common/gpu_rendering_stats.h" +#include "content/common/gpu/gpu_rendering_stats.h" #include "content/public/renderer/render_thread.h" #include "content/renderer/all_rendering_benchmarks.h" #include "content/renderer/render_view_impl.h" |