diff options
| -rw-r--r-- | chrome/browser/gpu_data_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 120 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 16 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 8 | ||||
| -rw-r--r-- | content/browser/gpu_process_host.cc | 2 | ||||
| -rw-r--r-- | content/content.gyp | 2 | ||||
| -rw-r--r-- | content/content_gpu.gypi | 128 | ||||
| -rw-r--r-- | content/gpu/DEPS (renamed from chrome/gpu/DEPS) | 0 | ||||
| -rw-r--r-- | content/gpu/gpu_channel.cc (renamed from chrome/gpu/gpu_channel.cc) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_channel.h (renamed from chrome/gpu/gpu_channel.h) | 10 | ||||
| -rw-r--r-- | content/gpu/gpu_command_buffer_stub.cc (renamed from chrome/gpu/gpu_command_buffer_stub.cc) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_command_buffer_stub.h (renamed from chrome/gpu/gpu_command_buffer_stub.h) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_config.h (renamed from chrome/gpu/gpu_config.h) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_dx_diagnostics_win.cc (renamed from chrome/gpu/gpu_dx_diagnostics_win.cc) | 5 | ||||
| -rw-r--r-- | content/gpu/gpu_idirect3d9_mock_win.cc (renamed from chrome/gpu/gpu_idirect3d9_mock_win.cc) | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_idirect3d9_mock_win.h (renamed from chrome/gpu/gpu_idirect3d9_mock_win.h) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector.cc (renamed from chrome/gpu/gpu_info_collector.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector.h (renamed from chrome/gpu/gpu_info_collector.h) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector_linux.cc (renamed from chrome/gpu/gpu_info_collector_linux.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector_mac.mm (renamed from chrome/gpu/gpu_info_collector_mac.mm) | 13 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector_unittest.cc (renamed from chrome/gpu/gpu_info_collector_unittest.cc) | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector_win.cc (renamed from chrome/gpu/gpu_info_collector_win.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/gpu_info_unittest_win.cc (renamed from chrome/gpu/gpu_info_unittest_win.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/gpu_main.cc (renamed from chrome/gpu/gpu_main.cc) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_process.cc (renamed from chrome/gpu/gpu_process.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/gpu_process.h (renamed from chrome/gpu/gpu_process.h) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_thread.cc (renamed from chrome/gpu/gpu_thread.cc) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_thread.h (renamed from chrome/gpu/gpu_thread.h) | 14 | ||||
| -rw-r--r-- | content/gpu/gpu_video_decoder.cc (renamed from chrome/gpu/gpu_video_decoder.cc) | 10 | ||||
| -rw-r--r-- | content/gpu/gpu_video_decoder.h (renamed from chrome/gpu/gpu_video_decoder.h) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_video_decoder_unittest.cc (renamed from chrome/gpu/gpu_video_decoder_unittest.cc) | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_video_service.cc (renamed from chrome/gpu/gpu_video_service.cc) | 8 | ||||
| -rw-r--r-- | content/gpu/gpu_video_service.h (renamed from chrome/gpu/gpu_video_service.h) | 10 | ||||
| -rw-r--r-- | content/gpu/gpu_watchdog_thread.cc (renamed from chrome/gpu/gpu_watchdog_thread.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/gpu_watchdog_thread.h (renamed from chrome/gpu/gpu_watchdog_thread.h) | 8 | ||||
| -rw-r--r-- | content/gpu/media/fake_gl_video_decode_engine.cc (renamed from chrome/gpu/media/fake_gl_video_decode_engine.cc) | 2 | ||||
| -rw-r--r-- | content/gpu/media/fake_gl_video_decode_engine.h (renamed from chrome/gpu/media/fake_gl_video_decode_engine.h) | 8 | ||||
| -rw-r--r-- | content/gpu/media/fake_gl_video_device.cc (renamed from chrome/gpu/media/fake_gl_video_device.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/media/fake_gl_video_device.h (renamed from chrome/gpu/media/fake_gl_video_device.h) | 10 | ||||
| -rw-r--r-- | content/gpu/media/gpu_video_device.h (renamed from chrome/gpu/media/gpu_video_device.h) | 8 | ||||
| -rw-r--r-- | content/gpu/media/mft_angle_video_device.cc (renamed from chrome/gpu/media/mft_angle_video_device.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/media/mft_angle_video_device.h (renamed from chrome/gpu/media/mft_angle_video_device.h) | 10 | ||||
| -rw-r--r-- | content/gpu/x_util.cc (renamed from chrome/gpu/x_util.cc) | 4 | ||||
| -rw-r--r-- | content/gpu/x_util.h (renamed from chrome/gpu/x_util.h) | 2 |
44 files changed, 264 insertions, 254 deletions
diff --git a/chrome/browser/gpu_data_manager.cc b/chrome/browser/gpu_data_manager.cc index 8b7274e..2e0a478 100644 --- a/chrome/browser/gpu_data_manager.cc +++ b/chrome/browser/gpu_data_manager.cc @@ -15,8 +15,8 @@ #include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "chrome/gpu/gpu_info_collector.h" #include "content/browser/gpu_blacklist.h" +#include "content/gpu/gpu_info_collector.h" #include "grit/browser_resources.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index daaab35..39a6265 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -23,7 +23,6 @@ 'chromium_dependencies': [ 'common', 'browser', - 'chrome_gpu', 'ppapi_plugin', 'profile_import', 'renderer', @@ -31,6 +30,7 @@ 'utility', 'worker', 'service', + '../content/content.gyp:content_gpu', '../printing/printing.gyp:printing', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resources', ], @@ -71,7 +71,6 @@ 'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'], # TODO: remove this helper when we have loops in GYP 'apply_locales_cmd': ['python', '<(DEPTH)/build/apply_locales.py'], - 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)', 'conditions': [ ['OS=="win"', { 'nacl_defines': [ @@ -643,123 +642,6 @@ ], }, { - 'target_name': 'chrome_gpu', - 'type': '<(library)', - 'msvs_guid': 'F10F1ECD-D84D-4C33-8468-9DDFE19F4D8A', - 'dependencies': [ - '../app/app.gyp:app_base', - '../base/base.gyp:base', - 'common', - '../media/media.gyp:media', - '../skia/skia.gyp:skia', - ], - 'sources': [ - 'gpu/gpu_channel.cc', - 'gpu/gpu_channel.h', - 'gpu/gpu_command_buffer_stub.cc', - 'gpu/gpu_command_buffer_stub.h', - 'gpu/gpu_config.h', - 'gpu/gpu_dx_diagnostics_win.cc', - 'gpu/gpu_info_collector_linux.cc', - 'gpu/gpu_info_collector_mac.mm', - 'gpu/gpu_info_collector_win.cc', - 'gpu/gpu_info_collector.cc', - 'gpu/gpu_info_collector.h', - 'gpu/gpu_main.cc', - 'gpu/gpu_process.cc', - 'gpu/gpu_process.h', - 'gpu/gpu_thread.cc', - 'gpu/gpu_thread.h', - 'gpu/gpu_video_decoder.cc', - 'gpu/gpu_video_decoder.h', - 'gpu/gpu_video_service.cc', - 'gpu/gpu_video_service.h', - 'gpu/gpu_watchdog_thread.cc', - 'gpu/gpu_watchdog_thread.h', - 'gpu/media/gpu_video_device.h', - 'gpu/media/fake_gl_video_decode_engine.cc', - 'gpu/media/fake_gl_video_decode_engine.h', - 'gpu/media/fake_gl_video_device.cc', - 'gpu/media/fake_gl_video_device.h', - ], - 'include_dirs': [ - '..', - ], - 'conditions': [ - ['OS=="win"', { - 'include_dirs': [ - '<(DEPTH)/third_party/angle/include', - '<(DEPTH)/third_party/angle/src', - '<(DEPTH)/third_party/wtl/include', - '$(DXSDK_DIR)/include', - ], - 'dependencies': [ - '../third_party/angle/src/build_angle.gyp:libEGL', - '../third_party/angle/src/build_angle.gyp:libGLESv2', - ], - }], - ['OS=="win" and directxsdk_exists=="True"', { - 'actions': [ - { - 'action_name': 'extract_d3dx9', - 'variables': { - 'input': 'Aug2009_d3dx9_42_x86.cab', - 'output': 'd3dx9_42.dll', - }, - 'inputs': [ - '../third_party/directxsdk/files/Redist/<(input)', - ], - 'outputs': [ - '<(PRODUCT_DIR)/<(output)', - ], - 'action': [ - 'python', - '../build/extract_from_cab.py', - '..\\third_party\\directxsdk\\files\\Redist\\<(input)', - '<(output)', - '<(PRODUCT_DIR)', - ], - }, - { - 'action_name': 'extract_d3dcompiler', - 'variables': { - 'input': 'Aug2009_D3DCompiler_42_x86.cab', - 'output': 'D3DCompiler_42.dll', - }, - 'inputs': [ - '../third_party/directxsdk/files/Redist/<(input)', - ], - 'outputs': [ - '<(PRODUCT_DIR)/<(output)', - ], - 'action': [ - 'python', - '../build/extract_from_cab.py', - '..\\third_party\\directxsdk\\files\\Redist\\<(input)', - '<(output)', - '<(PRODUCT_DIR)', - ], - }, - ], - 'sources': [ - 'gpu/media/mft_angle_video_device.cc', - 'gpu/media/mft_angle_video_device.h', - ], - }], - ['OS=="linux" and target_arch!="arm"', { - 'sources': [ - 'gpu/x_util.cc', - 'gpu/x_util.h', - ], - }], - ['enable_gpu==1', { - 'dependencies': [ - '../gpu/gpu.gyp:command_buffer_service', - ], - }], - ], - }, - { 'target_name': 'ppapi_plugin', 'type': '<(library)', 'dependencies': [ diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 9073e09..5e8ff4d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -26,13 +26,13 @@ 'browser', 'common', 'renderer', - 'chrome_gpu', 'chrome_resources', 'chrome_strings', 'app/policy/cloud_policy_codegen.gyp:policy', 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'theme_resources', '../base/base.gyp:test_support_base', + '../content/content.gyp:content_gpu', '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:media_test_support', # 'test/test_url_request_context_getter.h' brings in this requirement. @@ -1089,7 +1089,6 @@ 'browser', 'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp', 'chrome', - 'chrome_gpu', 'chrome_resources', 'chrome_strings', 'common', @@ -1102,6 +1101,7 @@ 'utility', '../app/app.gyp:app_base', '../app/app.gyp:app_resources', + '../content/content.gyp:content_gpu', '../gpu/gpu.gyp:gpu_unittest_utils', '../ipc/ipc.gyp:ipc', '../media/media.gyp:media_test_support', @@ -1753,11 +1753,6 @@ 'common/web_apps_unittest.cc', 'common/worker_thread_ticker_unittest.cc', 'common/zip_unittest.cc', - 'gpu/gpu_idirect3d9_mock_win.cc', - 'gpu/gpu_idirect3d9_mock_win.h', - 'gpu/gpu_info_collector_unittest.cc', - 'gpu/gpu_info_unittest_win.cc', - 'gpu/gpu_video_decoder_unittest.cc', 'renderer/audio_message_filter_unittest.cc', 'renderer/extensions/extension_api_json_validity_unittest.cc', 'renderer/extensions/json_schema_unittest.cc', @@ -1842,6 +1837,11 @@ '../content/common/sandbox_mac_unittest_helper.h', '../content/common/sandbox_mac_unittest_helper.mm', '../content/common/sandbox_mac_system_access_unittest.mm', + '../content/gpu/gpu_idirect3d9_mock_win.cc', + '../content/gpu/gpu_idirect3d9_mock_win.h', + '../content/gpu/gpu_info_collector_unittest.cc', + '../content/gpu/gpu_info_unittest_win.cc', + '../content/gpu/gpu_video_decoder_unittest.cc', '../testing/gtest_mac_unittest.mm', '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc', @@ -3277,10 +3277,10 @@ 'browser', 'common', 'renderer', - 'chrome_gpu', 'chrome_resources', 'chrome_strings', '../app/app.gyp:app_base', + '../content/content.gyp:content_gpu', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 273ae7c..2cdb516 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -231,7 +231,6 @@ 'dependencies': [ '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', - '../chrome/chrome.gyp:chrome_gpu', '../chrome/chrome.gyp:chrome_version_header', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', @@ -239,6 +238,7 @@ '../chrome/chrome.gyp:debugger', '../chrome/chrome.gyp:renderer', '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib', + '../content/content.gyp:content_gpu', '../net/net.gyp:net_test_support', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -348,12 +348,12 @@ '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', - '../chrome/chrome.gyp:chrome_gpu', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:browser', '../chrome/chrome.gyp:debugger', '../chrome/chrome.gyp:test_support_ui', '../chrome/chrome.gyp:utility', + '../content/content.gyp:content_gpu', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/libxml/libxml.gyp:libxml', @@ -432,11 +432,11 @@ 'dependencies': [ '../base/base.gyp:test_support_base', '../chrome/chrome.gyp:browser', - '../chrome/chrome.gyp:chrome_gpu', '../chrome/chrome.gyp:chrome_resources', '../chrome/chrome.gyp:debugger', '../chrome/chrome.gyp:renderer', '../chrome/chrome.gyp:syncapi', + '../content/content.gyp:content_gpu', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', @@ -510,10 +510,10 @@ '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../chrome/chrome.gyp:browser', - '../chrome/chrome.gyp:chrome_gpu', '../chrome/chrome.gyp:debugger', '../chrome/chrome.gyp:renderer', '../chrome/chrome.gyp:test_support_common', + '../content/content.gyp:content_gpu', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', 'chrome_frame_ie', diff --git a/content/browser/gpu_process_host.cc b/content/browser/gpu_process_host.cc index 900abff..6ecec5a 100644 --- a/content/browser/gpu_process_host.cc +++ b/content/browser/gpu_process_host.cc @@ -18,11 +18,11 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/gpu_feature_flags.h" #include "chrome/common/render_messages.h" -#include "chrome/gpu/gpu_thread.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/render_widget_host.h" #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/common/gpu_messages.h" +#include "content/gpu/gpu_thread.h" #include "ipc/ipc_channel_handle.h" #include "ipc/ipc_switches.h" #include "media/base/media_switches.h" diff --git a/content/content.gyp b/content/content.gyp index 328270b..936469f 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -9,6 +9,6 @@ 'includes': [ 'content_browser.gypi', 'content_common.gypi', - #'content_gpu.gypi', + 'content_gpu.gypi', ], } diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi new file mode 100644 index 0000000..ae65369 --- /dev/null +++ b/content/content_gpu.gypi @@ -0,0 +1,128 @@ +# Copyright (c) 2011 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. + +{ + 'variables': { + 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)', + }, # variables + 'targets': [ + { + 'target_name': 'content_gpu', + 'type': '<(library)', + 'msvs_guid': 'F10F1ECD-D84D-4C33-8468-9DDFE19F4D8A', + 'dependencies': [ + 'content_common', + '../app/app.gyp:app_base', + '../base/base.gyp:base', + '../media/media.gyp:media', + '../skia/skia.gyp:skia', + ], + 'sources': [ + 'gpu/gpu_channel.cc', + 'gpu/gpu_channel.h', + 'gpu/gpu_command_buffer_stub.cc', + 'gpu/gpu_command_buffer_stub.h', + 'gpu/gpu_config.h', + 'gpu/gpu_dx_diagnostics_win.cc', + 'gpu/gpu_info_collector_linux.cc', + 'gpu/gpu_info_collector_mac.mm', + 'gpu/gpu_info_collector_win.cc', + 'gpu/gpu_info_collector.cc', + 'gpu/gpu_info_collector.h', + 'gpu/gpu_main.cc', + 'gpu/gpu_process.cc', + 'gpu/gpu_process.h', + 'gpu/gpu_thread.cc', + 'gpu/gpu_thread.h', + 'gpu/gpu_video_decoder.cc', + 'gpu/gpu_video_decoder.h', + 'gpu/gpu_video_service.cc', + 'gpu/gpu_video_service.h', + 'gpu/gpu_watchdog_thread.cc', + 'gpu/gpu_watchdog_thread.h', + 'gpu/media/gpu_video_device.h', + 'gpu/media/fake_gl_video_decode_engine.cc', + 'gpu/media/fake_gl_video_decode_engine.h', + 'gpu/media/fake_gl_video_device.cc', + 'gpu/media/fake_gl_video_device.h', + ], + 'include_dirs': [ + '..', + ], + 'conditions': [ + ['OS=="win"', { + 'include_dirs': [ + '<(DEPTH)/third_party/angle/include', + '<(DEPTH)/third_party/angle/src', + '<(DEPTH)/third_party/wtl/include', + '$(DXSDK_DIR)/include', + ], + 'dependencies': [ + '../third_party/angle/src/build_angle.gyp:libEGL', + '../third_party/angle/src/build_angle.gyp:libGLESv2', + ], + }], + ['OS=="win" and directxsdk_exists=="True"', { + 'actions': [ + { + 'action_name': 'extract_d3dx9', + 'variables': { + 'input': 'Aug2009_d3dx9_42_x86.cab', + 'output': 'd3dx9_42.dll', + }, + 'inputs': [ + '../third_party/directxsdk/files/Redist/<(input)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/<(output)', + ], + 'action': [ + 'python', + '../build/extract_from_cab.py', + '..\\third_party\\directxsdk\\files\\Redist\\<(input)', + '<(output)', + '<(PRODUCT_DIR)', + ], + }, + { + 'action_name': 'extract_d3dcompiler', + 'variables': { + 'input': 'Aug2009_D3DCompiler_42_x86.cab', + 'output': 'D3DCompiler_42.dll', + }, + 'inputs': [ + '../third_party/directxsdk/files/Redist/<(input)', + ], + 'outputs': [ + '<(PRODUCT_DIR)/<(output)', + ], + 'action': [ + 'python', + '../build/extract_from_cab.py', + '..\\third_party\\directxsdk\\files\\Redist\\<(input)', + '<(output)', + '<(PRODUCT_DIR)', + ], + }, + ], + 'sources': [ + 'gpu/media/mft_angle_video_device.cc', + 'gpu/media/mft_angle_video_device.h', + ], + }], + ['OS=="linux" and target_arch!="arm"', { + 'sources': [ + 'gpu/x_util.cc', + 'gpu/x_util.h', + ], + }], + ['enable_gpu==1', { + 'dependencies': [ + '../gpu/gpu.gyp:command_buffer_service', + ], + }], + ], + }, + ], +} diff --git a/chrome/gpu/DEPS b/content/gpu/DEPS index 66112a0..66112a0 100644 --- a/chrome/gpu/DEPS +++ b/content/gpu/DEPS diff --git a/chrome/gpu/gpu_channel.cc b/content/gpu/gpu_channel.cc index 8b1e1d2..7f9435c 100644 --- a/chrome/gpu/gpu_channel.cc +++ b/content/gpu/gpu_channel.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,16 +6,16 @@ #include <windows.h> #endif -#include "chrome/gpu/gpu_channel.h" +#include "content/gpu/gpu_channel.h" #include "base/command_line.h" #include "base/process_util.h" #include "base/string_util.h" -#include "chrome/gpu/gpu_thread.h" -#include "chrome/gpu/gpu_video_service.h" #include "content/common/child_process.h" #include "content/common/content_switches.h" #include "content/common/gpu_messages.h" +#include "content/gpu/gpu_thread.h" +#include "content/gpu/gpu_video_service.h" #if defined(OS_POSIX) #include "ipc/ipc_channel_posix.h" diff --git a/chrome/gpu/gpu_channel.h b/content/gpu/gpu_channel.h index 2512104..5ad31e3 100644 --- a/chrome/gpu/gpu_channel.h +++ b/content/gpu/gpu_channel.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_CHANNEL_H_ -#define CHROME_GPU_GPU_CHANNEL_H_ +#ifndef CONTENT_GPU_GPU_CHANNEL_H_ +#define CONTENT_GPU_GPU_CHANNEL_H_ #pragma once #include <set> @@ -14,8 +14,8 @@ #include "base/process.h" #include "base/scoped_ptr.h" #include "build/build_config.h" -#include "chrome/gpu/gpu_command_buffer_stub.h" #include "content/common/message_router.h" +#include "content/gpu/gpu_command_buffer_stub.h" #include "ipc/ipc_sync_channel.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/size.h" @@ -124,4 +124,4 @@ class GpuChannel : public IPC::Channel::Listener, DISALLOW_COPY_AND_ASSIGN(GpuChannel); }; -#endif // CHROME_GPU_GPU_CHANNEL_H_ +#endif // CONTENT_GPU_GPU_CHANNEL_H_ diff --git a/chrome/gpu/gpu_command_buffer_stub.cc b/content/gpu/gpu_command_buffer_stub.cc index 17a9235..a67dfd5 100644 --- a/chrome/gpu/gpu_command_buffer_stub.cc +++ b/content/gpu/gpu_command_buffer_stub.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,11 +7,11 @@ #include "base/process_util.h" #include "base/shared_memory.h" #include "build/build_config.h" -#include "chrome/gpu/gpu_channel.h" -#include "chrome/gpu/gpu_command_buffer_stub.h" -#include "chrome/gpu/gpu_thread.h" #include "content/common/child_thread.h" #include "content/common/gpu_messages.h" +#include "content/gpu/gpu_channel.h" +#include "content/gpu/gpu_command_buffer_stub.h" +#include "content/gpu/gpu_thread.h" using gpu::Buffer; diff --git a/chrome/gpu/gpu_command_buffer_stub.h b/content/gpu/gpu_command_buffer_stub.h index 7124e25..69fbcc0 100644 --- a/chrome/gpu/gpu_command_buffer_stub.h +++ b/content/gpu/gpu_command_buffer_stub.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_COMMAND_BUFFER_STUB_H_ -#define CHROME_GPU_GPU_COMMAND_BUFFER_STUB_H_ +#ifndef CONTENT_GPU_GPU_COMMAND_BUFFER_STUB_H_ +#define CONTENT_GPU_GPU_COMMAND_BUFFER_STUB_H_ #pragma once #if defined(ENABLE_GPU) @@ -128,4 +128,4 @@ class GpuCommandBufferStub #endif // defined(ENABLE_GPU) -#endif // CHROME_GPU_GPU_COMMAND_BUFFER_STUB_H_ +#endif // CONTENT_GPU_GPU_COMMAND_BUFFER_STUB_H_ diff --git a/chrome/gpu/gpu_config.h b/content/gpu/gpu_config.h index 884d2ff..8aba7bf 100644 --- a/chrome/gpu/gpu_config.h +++ b/content/gpu/gpu_config.h @@ -1,13 +1,13 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_CONFIG_H_ -#define CHROME_GPU_GPU_CONFIG_H_ +#ifndef CONTENT_GPU_GPU_CONFIG_H_ +#define CONTENT_GPU_GPU_CONFIG_H_ #pragma once // This file declares common preprocessor configuration for the GPU process. #include "build/build_config.h" -#endif // CHROME_GPU_GPU_CONFIG_H_ +#endif // CONTENT_GPU_GPU_CONFIG_H_ diff --git a/chrome/gpu/gpu_dx_diagnostics_win.cc b/content/gpu/gpu_dx_diagnostics_win.cc index 8c1960d..c36ea8f 100644 --- a/chrome/gpu/gpu_dx_diagnostics_win.cc +++ b/content/gpu/gpu_dx_diagnostics_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // @@ -9,10 +9,9 @@ #include <dxdiag.h> #include <windows.h> -#include "chrome/gpu/gpu_info_collector.h" - #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" +#include "content/gpu/gpu_info_collector.h" namespace { diff --git a/chrome/gpu/gpu_idirect3d9_mock_win.cc b/content/gpu/gpu_idirect3d9_mock_win.cc index aef4482..68893eb 100644 --- a/chrome/gpu/gpu_idirect3d9_mock_win.cc +++ b/content/gpu/gpu_idirect3d9_mock_win.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 "chrome/gpu/gpu_idirect3d9_mock_win.h" +#include "content/gpu/gpu_idirect3d9_mock_win.h" IDirect3D9Mock::IDirect3D9Mock() {} diff --git a/chrome/gpu/gpu_idirect3d9_mock_win.h b/content/gpu/gpu_idirect3d9_mock_win.h index 30568c3..25752a5 100644 --- a/chrome/gpu/gpu_idirect3d9_mock_win.h +++ b/content/gpu/gpu_idirect3d9_mock_win.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_IDIRECT3D9_MOCK_WIN_H__ -#define CHROME_GPU_GPU_IDIRECT3D9_MOCK_WIN_H__ +#ifndef CONTENT_GPU_GPU_IDIRECT3D9_MOCK_WIN_H_ +#define CONTENT_GPU_GPU_IDIRECT3D9_MOCK_WIN_H_ #pragma once #include <d3d9.h> @@ -74,4 +74,4 @@ class IDirect3D9Mock : public IDirect3D9 { MOCK_METHOD0_WITH_CALLTYPE(STDMETHODCALLTYPE, Release, ULONG()); }; -#endif // CHROME_GPU_GPU_IDIRECT3D9_MOCK_WIN_H__ +#endif // CONTENT_GPU_GPU_IDIRECT3D9_MOCK_WIN_H_ diff --git a/chrome/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index 92bcb89..5211e9d 100644 --- a/chrome/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/gpu_info_collector.h" +#include "content/gpu/gpu_info_collector.h" #include <string> #include <vector> diff --git a/chrome/gpu/gpu_info_collector.h b/content/gpu/gpu_info_collector.h index 91b77ac..eb669a0 100644 --- a/chrome/gpu/gpu_info_collector.h +++ b/content/gpu/gpu_info_collector.h @@ -1,9 +1,9 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_INFO_COLLECTOR_H__ -#define CHROME_GPU_GPU_INFO_COLLECTOR_H__ +#ifndef CONTENT_GPU_GPU_INFO_COLLECTOR_H_ +#define CONTENT_GPU_GPU_INFO_COLLECTOR_H_ #pragma once #include "base/basictypes.h" @@ -54,4 +54,4 @@ bool CollectDriverInfoGL(GPUInfo* gpu_info); } // namespace gpu_info_collector -#endif // CHROME_GPU_GPU_INFO_COLLECTOR_H__ +#endif // CONTENT_GPU_GPU_INFO_COLLECTOR_H_ diff --git a/chrome/gpu/gpu_info_collector_linux.cc b/content/gpu/gpu_info_collector_linux.cc index e77d6ff..08b1f9c 100644 --- a/chrome/gpu/gpu_info_collector_linux.cc +++ b/content/gpu/gpu_info_collector_linux.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/gpu_info_collector.h" +#include "content/gpu/gpu_info_collector.h" #include <dlfcn.h> #include <vector> diff --git a/chrome/gpu/gpu_info_collector_mac.mm b/content/gpu/gpu_info_collector_mac.mm index 68327fe..e1b625d 100644 --- a/chrome/gpu/gpu_info_collector_mac.mm +++ b/content/gpu/gpu_info_collector_mac.mm @@ -1,16 +1,17 @@ -// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/gpu_info_collector.h" -#include "base/logging.h" -#include "base/scoped_ptr.h" -#include "base/string_piece.h" -#include "base/sys_string_conversions.h" +#include "content/gpu/gpu_info_collector.h" + #include "app/gfx/gl/gl_bindings.h" #include "app/gfx/gl/gl_context.h" #include "app/gfx/gl/gl_implementation.h" #include "app/gfx/gl/gl_interface.h" +#include "base/logging.h" +#include "base/scoped_ptr.h" +#include "base/string_piece.h" +#include "base/sys_string_conversions.h" #import <Cocoa/Cocoa.h> #import <Foundation/Foundation.h> diff --git a/chrome/gpu/gpu_info_collector_unittest.cc b/content/gpu/gpu_info_collector_unittest.cc index 87e6376..a441484 100644 --- a/chrome/gpu/gpu_info_collector_unittest.cc +++ b/content/gpu/gpu_info_collector_unittest.cc @@ -4,8 +4,8 @@ #include "app/gfx/gl/gl_implementation.h" #include "base/scoped_ptr.h" -#include "chrome/gpu/gpu_info_collector.h" #include "content/common/gpu_info.h" +#include "content/gpu/gpu_info_collector.h" #include "gpu/command_buffer/common/gl_mock.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 2617fb0..35ab7c0 100644 --- a/chrome/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/gpu_info_collector.h" +#include "content/gpu/gpu_info_collector.h" #include <d3d9.h> #include <setupapi.h> diff --git a/chrome/gpu/gpu_info_unittest_win.cc b/content/gpu/gpu_info_unittest_win.cc index a6375069..d468a48 100644 --- a/chrome/gpu/gpu_info_unittest_win.cc +++ b/content/gpu/gpu_info_unittest_win.cc @@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/scoped_ptr.h" -#include "chrome/gpu/gpu_idirect3d9_mock_win.h" -#include "chrome/gpu/gpu_info_collector.h" #include "content/common/gpu_info.h" +#include "content/gpu/gpu_idirect3d9_mock_win.h" +#include "content/gpu/gpu_info_collector.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index 16a3add..ec79ba9 100644 --- a/chrome/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 @@ #include "build/build_config.h" #include "content/common/content_switches.h" #include "content/common/main_function_params.h" -#include "chrome/gpu/gpu_config.h" -#include "chrome/gpu/gpu_process.h" -#include "chrome/gpu/gpu_thread.h" +#include "content/gpu/gpu_config.h" +#include "content/gpu/gpu_process.h" +#include "content/gpu/gpu_thread.h" #if defined(OS_MACOSX) #include "content/common/chrome_application_mac.h" diff --git a/chrome/gpu/gpu_process.cc b/content/gpu/gpu_process.cc index ada83c8..252ceb1 100644 --- a/chrome/gpu/gpu_process.cc +++ b/content/gpu/gpu_process.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/gpu_process.h" +#include "content/gpu/gpu_process.h" GpuProcess::GpuProcess() { } diff --git a/chrome/gpu/gpu_process.h b/content/gpu/gpu_process.h index 7a8caba..8dfe0e3 100644 --- a/chrome/gpu/gpu_process.h +++ b/content/gpu/gpu_process.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_PROCESS_H_ -#define CHROME_GPU_GPU_PROCESS_H_ +#ifndef CONTENT_GPU_GPU_PROCESS_H_ +#define CONTENT_GPU_GPU_PROCESS_H_ #pragma once #include "content/common/child_process.h" @@ -17,4 +17,4 @@ class GpuProcess : public ChildProcess { DISALLOW_COPY_AND_ASSIGN(GpuProcess); }; -#endif // CHROME_GPU_GPU_PROCESS_H_ +#endif // CONTENT_GPU_GPU_PROCESS_H_ diff --git a/chrome/gpu/gpu_thread.cc b/content/gpu/gpu_thread.cc index a944907..7eaf7fd 100644 --- a/chrome/gpu/gpu_thread.cc +++ b/content/gpu/gpu_thread.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/gpu_thread.h" +#include "content/gpu/gpu_thread.h" #include <string> #include <vector> @@ -13,12 +13,12 @@ #include "base/command_line.h" #include "base/threading/worker_pool.h" #include "build/build_config.h" -#include "chrome/gpu/gpu_info_collector.h" -#include "chrome/gpu/gpu_watchdog_thread.h" #include "content/common/child_process.h" #include "content/common/content_client.h" #include "content/common/content_switches.h" #include "content/common/gpu_messages.h" +#include "content/gpu/gpu_info_collector.h" +#include "content/gpu/gpu_watchdog_thread.h" #include "ipc/ipc_channel_handle.h" #if defined(OS_MACOSX) diff --git a/chrome/gpu/gpu_thread.h b/content/gpu/gpu_thread.h index 7c3cef4..21ad923 100644 --- a/chrome/gpu/gpu_thread.h +++ b/content/gpu/gpu_thread.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_THREAD_H_ -#define CHROME_GPU_GPU_THREAD_H_ +#ifndef CONTENT_GPU_GPU_THREAD_H_ +#define CONTENT_GPU_GPU_THREAD_H_ #pragma once #include <string> @@ -13,11 +13,11 @@ #include "base/scoped_ptr.h" #include "base/time.h" #include "build/build_config.h" -#include "chrome/gpu/gpu_channel.h" -#include "chrome/gpu/gpu_config.h" -#include "chrome/gpu/x_util.h" #include "content/common/child_thread.h" #include "content/common/gpu_info.h" +#include "content/gpu/gpu_channel.h" +#include "content/gpu/gpu_config.h" +#include "content/gpu/x_util.h" #include "ui/gfx/native_widget_types.h" namespace IPC { @@ -94,4 +94,4 @@ class GpuThread : public ChildThread { DISALLOW_COPY_AND_ASSIGN(GpuThread); }; -#endif // CHROME_GPU_GPU_THREAD_H_ +#endif // CONTENT_GPU_GPU_THREAD_H_ diff --git a/chrome/gpu/gpu_video_decoder.cc b/content/gpu/gpu_video_decoder.cc index 96be0c3..0416fcd 100644 --- a/chrome/gpu/gpu_video_decoder.cc +++ b/content/gpu/gpu_video_decoder.cc @@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/gpu/gpu_video_decoder.h" +#include "content/gpu/gpu_video_decoder.h" #include "base/command_line.h" -#include "chrome/gpu/gpu_channel.h" -#include "chrome/gpu/media/fake_gl_video_decode_engine.h" -#include "chrome/gpu/media/fake_gl_video_device.h" #include "content/common/child_thread.h" #include "content/common/gpu_messages.h" +#include "content/gpu/gpu_channel.h" +#include "content/gpu/media/fake_gl_video_decode_engine.h" +#include "content/gpu/media/fake_gl_video_device.h" #include "media/base/data_buffer.h" #include "media/base/media_switches.h" #include "media/base/video_frame.h" #if defined(OS_WIN) -#include "chrome/gpu/media/mft_angle_video_device.h" +#include "content/gpu/media/mft_angle_video_device.h" #include "media/video/mft_h264_decode_engine.h" #include <d3d9.h> #endif diff --git a/chrome/gpu/gpu_video_decoder.h b/content/gpu/gpu_video_decoder.h index 92bbb70..ce91491 100644 --- a/chrome/gpu/gpu_video_decoder.h +++ b/content/gpu/gpu_video_decoder.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 CHROME_GPU_GPU_VIDEO_DECODER_H_ -#define CHROME_GPU_GPU_VIDEO_DECODER_H_ +#ifndef CONTENT_GPU_GPU_VIDEO_DECODER_H_ +#define CONTENT_GPU_GPU_VIDEO_DECODER_H_ #include <map> #include <vector> @@ -14,7 +14,7 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/shared_memory.h" -#include "chrome/gpu/media/gpu_video_device.h" +#include "content/gpu/media/gpu_video_device.h" #include "media/video/video_decode_context.h" #include "media/video/video_decode_engine.h" #include "ipc/ipc_channel.h" @@ -206,4 +206,4 @@ class GpuVideoDecoder DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder); }; -#endif // CHROME_GPU_GPU_VIDEO_DECODER_H_ +#endif // CONTENT_GPU_GPU_VIDEO_DECODER_H_ diff --git a/chrome/gpu/gpu_video_decoder_unittest.cc b/content/gpu/gpu_video_decoder_unittest.cc index 4b8b18f..afb396b 100644 --- a/chrome/gpu/gpu_video_decoder_unittest.cc +++ b/content/gpu/gpu_video_decoder_unittest.cc @@ -4,8 +4,8 @@ #include "base/message_loop.h" #include "base/process.h" -#include "chrome/gpu/gpu_video_decoder.h" #include "content/common/gpu_messages.h" +#include "content/gpu/gpu_video_decoder.h" #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" #include "ipc/ipc_message_utils.h" #include "media/base/pipeline.h" diff --git a/chrome/gpu/gpu_video_service.cc b/content/gpu/gpu_video_service.cc index 008fb69..355aabc 100644 --- a/chrome/gpu/gpu_video_service.cc +++ b/content/gpu/gpu_video_service.cc @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/gpu_channel.h" -#include "chrome/gpu/gpu_video_decoder.h" -#include "chrome/gpu/gpu_video_service.h" #include "content/common/gpu_messages.h" +#include "content/gpu/gpu_channel.h" +#include "content/gpu/gpu_video_decoder.h" +#include "content/gpu/gpu_video_service.h" struct GpuVideoService::GpuVideoDecoderInfo { scoped_refptr<GpuVideoDecoder> decoder; diff --git a/chrome/gpu/gpu_video_service.h b/content/gpu/gpu_video_service.h index 371cf4b..5e9d015 100644 --- a/chrome/gpu/gpu_video_service.h +++ b/content/gpu/gpu_video_service.h @@ -1,15 +1,15 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_VIDEO_SERVICE_H_ -#define CHROME_GPU_GPU_VIDEO_SERVICE_H_ +#ifndef CONTENT_GPU_GPU_VIDEO_SERVICE_H_ +#define CONTENT_GPU_GPU_VIDEO_SERVICE_H_ #include <map> #include "base/ref_counted.h" #include "base/singleton.h" -#include "chrome/gpu/gpu_video_decoder.h" +#include "content/gpu/gpu_video_decoder.h" #include "ipc/ipc_channel.h" class GpuChannel; @@ -48,4 +48,4 @@ class GpuVideoService : public IPC::Channel::Listener { DISALLOW_COPY_AND_ASSIGN(GpuVideoService); }; -#endif // CHROME_GPU_GPU_VIDEO_SERVICE_H_ +#endif // CONTENT_GPU_GPU_VIDEO_SERVICE_H_ diff --git a/chrome/gpu/gpu_watchdog_thread.cc b/content/gpu/gpu_watchdog_thread.cc index bb01097..a7d723c 100644 --- a/chrome/gpu/gpu_watchdog_thread.cc +++ b/content/gpu/gpu_watchdog_thread.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -6,7 +6,7 @@ #include <windows.h> #endif -#include "chrome/gpu/gpu_watchdog_thread.h" +#include "content/gpu/gpu_watchdog_thread.h" #include "base/compiler_specific.h" #include "build/build_config.h" diff --git a/chrome/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h index 2f80888..b0812a6 100644 --- a/chrome/gpu/gpu_watchdog_thread.h +++ b/content/gpu/gpu_watchdog_thread.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_GPU_WATCHDOG_THREAD_H_ -#define CHROME_GPU_GPU_WATCHDOG_THREAD_H_ +#ifndef CONTENT_GPU_GPU_WATCHDOG_THREAD_H_ +#define CONTENT_GPU_GPU_WATCHDOG_THREAD_H_ #include "base/message_loop.h" #include "base/ref_counted.h" @@ -71,4 +71,4 @@ class GpuWatchdogThread : public base::Thread, DISALLOW_COPY_AND_ASSIGN(GpuWatchdogThread); }; -#endif // CHROME_GPU_GPU_WATCHDOG_THREAD_H_ +#endif // CONTENT_GPU_GPU_WATCHDOG_THREAD_H_ diff --git a/chrome/gpu/media/fake_gl_video_decode_engine.cc b/content/gpu/media/fake_gl_video_decode_engine.cc index 2c68f11..0486a01 100644 --- a/chrome/gpu/media/fake_gl_video_decode_engine.cc +++ b/content/gpu/media/fake_gl_video_decode_engine.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 "chrome/gpu/media/fake_gl_video_decode_engine.h" +#include "content/gpu/media/fake_gl_video_decode_engine.h" #include "media/base/limits.h" #include "media/base/video_frame.h" diff --git a/chrome/gpu/media/fake_gl_video_decode_engine.h b/content/gpu/media/fake_gl_video_decode_engine.h index 9ffe4268..e065228 100644 --- a/chrome/gpu/media/fake_gl_video_decode_engine.h +++ b/content/gpu/media/fake_gl_video_decode_engine.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_MEDIA_FAKE_GL_VIDEO_DECODE_ENGINE_H_ -#define CHROME_GPU_MEDIA_FAKE_GL_VIDEO_DECODE_ENGINE_H_ +#ifndef CONTENT_GPU_MEDIA_FAKE_GL_VIDEO_DECODE_ENGINE_H_ +#define CONTENT_GPU_MEDIA_FAKE_GL_VIDEO_DECODE_ENGINE_H_ #include <queue> #include <vector> @@ -65,4 +65,4 @@ class FakeGlVideoDecodeEngine : public media::VideoDecodeEngine { DISALLOW_COPY_AND_ASSIGN(FakeGlVideoDecodeEngine); }; -#endif // CHROME_GPU_MEDIA_FAKE_GL_VIDEO_DECODE_ENGINE_H_ +#endif // CONTENT_GPU_MEDIA_FAKE_GL_VIDEO_DECODE_ENGINE_H_ diff --git a/chrome/gpu/media/fake_gl_video_device.cc b/content/gpu/media/fake_gl_video_device.cc index 397b20f..f4e8746e6 100644 --- a/chrome/gpu/media/fake_gl_video_device.cc +++ b/content/gpu/media/fake_gl_video_device.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/media/fake_gl_video_device.h" +#include "content/gpu/media/fake_gl_video_device.h" #include "app/gfx/gl/gl_bindings.h" #include "media/base/video_frame.h" diff --git a/chrome/gpu/media/fake_gl_video_device.h b/content/gpu/media/fake_gl_video_device.h index 2075547..f5acb1a 100644 --- a/chrome/gpu/media/fake_gl_video_device.h +++ b/content/gpu/media/fake_gl_video_device.h @@ -1,11 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_MEDIA_FAKE_GL_VIDEO_DEVICE_H_ -#define CHROME_GPU_MEDIA_FAKE_GL_VIDEO_DEVICE_H_ +#ifndef CONTENT_GPU_MEDIA_FAKE_GL_VIDEO_DEVICE_H_ +#define CONTENT_GPU_MEDIA_FAKE_GL_VIDEO_DEVICE_H_ -#include "chrome/gpu/media/gpu_video_device.h" +#include "content/gpu/media/gpu_video_device.h" // A simple GpuVideoDevice that create VideoFrame with GL textures. // It uploads frames in RGBA format in system memory to the GL texture. @@ -24,4 +24,4 @@ class FakeGlVideoDevice : public GpuVideoDevice { scoped_refptr<media::VideoFrame> frame); }; -#endif // CHROME_GPU_MEDIA_FAKE_GL_VIDEO_DEVICE_H_ +#endif // CONTENT_GPU_MEDIA_FAKE_GL_VIDEO_DEVICE_H_ diff --git a/chrome/gpu/media/gpu_video_device.h b/content/gpu/media/gpu_video_device.h index 1ee4b6b..dcba5f2 100644 --- a/chrome/gpu/media/gpu_video_device.h +++ b/content/gpu/media/gpu_video_device.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_MEDIA_GPU_VIDEO_DEVICE_H_ -#define CHROME_GPU_MEDIA_GPU_VIDEO_DEVICE_H_ +#ifndef CONTENT_GPU_MEDIA_GPU_VIDEO_DEVICE_H_ +#define CONTENT_GPU_MEDIA_GPU_VIDEO_DEVICE_H_ #include <vector> @@ -53,4 +53,4 @@ class GpuVideoDevice { scoped_refptr<media::VideoFrame> frame) = 0; }; -#endif // CHROME_GPU_MEDIA_GPU_VIDEO_DEVICE_H_ +#endif // CONTENT_GPU_MEDIA_GPU_VIDEO_DEVICE_H_ diff --git a/chrome/gpu/media/mft_angle_video_device.cc b/content/gpu/media/mft_angle_video_device.cc index 56cb717..355ffa3 100644 --- a/chrome/gpu/media/mft_angle_video_device.cc +++ b/content/gpu/media/mft_angle_video_device.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/media/mft_angle_video_device.h" +#include "content/gpu/media/mft_angle_video_device.h" #include <d3d9.h> diff --git a/chrome/gpu/media/mft_angle_video_device.h b/content/gpu/media/mft_angle_video_device.h index 0775a06..6d85de2 100644 --- a/chrome/gpu/media/mft_angle_video_device.h +++ b/content/gpu/media/mft_angle_video_device.h @@ -1,12 +1,12 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#ifndef CHROME_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_ -#define CHROME_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_ +#ifndef CONTENT_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_ +#define CONTENT_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_ #include "base/scoped_comptr_win.h" -#include "chrome/gpu/media/gpu_video_device.h" +#include "content/gpu/media/gpu_video_device.h" struct IDirect3DDevice9; extern "C" const GUID IID_IDirect3DDevice9; @@ -39,4 +39,4 @@ class MftAngleVideoDevice : public GpuVideoDevice { ScopedComPtr<IDirect3DDevice9, &IID_IDirect3DDevice9> device_; }; -#endif // CHROME_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_ +#endif // CONTENT_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_ diff --git a/chrome/gpu/x_util.cc b/content/gpu/x_util.cc index 3756f67..72089e6 100644 --- a/chrome/gpu/x_util.cc +++ b/content/gpu/x_util.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. -#include "chrome/gpu/x_util.h" +#include "content/gpu/x_util.h" #include <X11/Xutil.h> diff --git a/chrome/gpu/x_util.h b/content/gpu/x_util.h index 9b4727a..c854080 100644 --- a/chrome/gpu/x_util.h +++ b/content/gpu/x_util.h @@ -10,7 +10,7 @@ // be a NOP on non-Linux ones. #include "build/build_config.h" -#include "chrome/gpu/gpu_config.h" +#include "content/gpu/gpu_config.h" #if defined(OS_LINUX) |