diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 19:13:56 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-18 19:13:56 +0000 |
| commit | 8bac37b5e8327ec15ba6970de0d8550eecfd31c7 (patch) | |
| tree | da3be41b0f3fbb585f5836247b263b113f12a47c /gpu | |
| parent | 4b9c9e299e0249e0a227a9c7031e0f7e9a290125 (diff) | |
| download | chromium_src-8bac37b5e8327ec15ba6970de0d8550eecfd31c7.zip chromium_src-8bac37b5e8327ec15ba6970de0d8550eecfd31c7.tar.gz chromium_src-8bac37b5e8327ec15ba6970de0d8550eecfd31c7.tar.bz2 | |
Use a direct include of the shared_memory header in content/plugin/, content/public/, content/renderer/, gpu/.
BUG=260807
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19379005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/command_buffer_service.h | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gpu_scheduler.h | 4 | ||||
| -rw-r--r-- | gpu/command_buffer/service/query_manager.cc | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/transfer_buffer_manager.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h index af3cb0c..232bdc0 100644 --- a/gpu/command_buffer/service/command_buffer_service.h +++ b/gpu/command_buffer/service/command_buffer_service.h @@ -6,7 +6,7 @@ #define GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_ #include "base/callback.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/command_buffer_shared.h" diff --git a/gpu/command_buffer/service/gpu_scheduler.h b/gpu/command_buffer/service/gpu_scheduler.h index bc8510a..8fb791c 100644 --- a/gpu/command_buffer/service/gpu_scheduler.h +++ b/gpu/command_buffer/service/gpu_scheduler.h @@ -7,14 +7,14 @@ #include <queue> -#include "base/atomicops.h" #include "base/atomic_ref_count.h" +#include "base/atomicops.h" #include "base/callback.h" #include "base/memory/linked_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/memory/shared_memory.h" #include "base/memory/weak_ptr.h" -#include "base/shared_memory.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/service/cmd_buffer_engine.h" #include "gpu/command_buffer/service/cmd_parser.h" diff --git a/gpu/command_buffer/service/query_manager.cc b/gpu/command_buffer/service/query_manager.cc index add23b6..4af0349 100644 --- a/gpu/command_buffer/service/query_manager.cc +++ b/gpu/command_buffer/service/query_manager.cc @@ -7,7 +7,7 @@ #include "base/atomicops.h" #include "base/bind.h" #include "base/logging.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "base/synchronization/lock.h" #include "base/time/time.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" diff --git a/gpu/command_buffer/service/transfer_buffer_manager.h b/gpu/command_buffer/service/transfer_buffer_manager.h index 47d5634..5e1a746 100644 --- a/gpu/command_buffer/service/transfer_buffer_manager.h +++ b/gpu/command_buffer/service/transfer_buffer_manager.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/containers/hash_tables.h" -#include "base/shared_memory.h" +#include "base/memory/shared_memory.h" #include "gpu/command_buffer/common/command_buffer_shared.h" namespace gpu { |