diff options
Diffstat (limited to 'chromium/gpu')
| -rw-r--r-- | chromium/gpu/command_buffer/service/query_manager.cc | 3 | ||||
| -rw-r--r-- | chromium/gpu/command_buffer_client.gypi | 3 | ||||
| -rw-r--r-- | chromium/gpu/command_buffer_common.gypi | 3 | ||||
| -rw-r--r-- | chromium/gpu/config/dx_diag_node.cc | 4 | ||||
| -rw-r--r-- | chromium/gpu/config/dx_diag_node.h | 6 | ||||
| -rw-r--r-- | chromium/gpu/gpu.gyp | 18 |
6 files changed, 3 insertions, 34 deletions
diff --git a/chromium/gpu/command_buffer/service/query_manager.cc b/chromium/gpu/command_buffer/service/query_manager.cc index 85e273c6c3a..db508e0a7f7 100644 --- a/chromium/gpu/command_buffer/service/query_manager.cc +++ b/chromium/gpu/command_buffer/service/query_manager.cc @@ -98,6 +98,9 @@ bool AsyncPixelTransfersCompletedQuery::End(uint32 submit_count) { mem_params.shm_size = buffer.size; mem_params.shm_data_offset = shm_offset(); mem_params.shm_data_size = sizeof(QuerySync); + uint32 end = mem_params.shm_data_offset + mem_params.shm_data_size; + if (end > mem_params.shm_size || end < mem_params.shm_data_offset) + return false; observer_ = new AsyncPixelTransferCompletionObserverImpl(submit_count); diff --git a/chromium/gpu/command_buffer_client.gypi b/chromium/gpu/command_buffer_client.gypi index 827474cfda0..cb52ee75fb3 100644 --- a/chromium/gpu/command_buffer_client.gypi +++ b/chromium/gpu/command_buffer_client.gypi @@ -14,9 +14,6 @@ 'dependencies': [ '../third_party/khronos/khronos.gyp:khronos_headers', ], - 'export_dependent_settings': [ - '../third_party/khronos/khronos.gyp:khronos_headers', - ], 'sources': [ 'command_buffer/client/cmd_buffer_helper.cc', 'command_buffer/client/cmd_buffer_helper.h', diff --git a/chromium/gpu/command_buffer_common.gypi b/chromium/gpu/command_buffer_common.gypi index ab9a635a368..87eeb5bf9d8 100644 --- a/chromium/gpu/command_buffer_common.gypi +++ b/chromium/gpu/command_buffer_common.gypi @@ -6,9 +6,6 @@ 'dependencies': [ '../third_party/khronos/khronos.gyp:khronos_headers', ], - 'export_dependent_settings': [ - '../third_party/khronos/khronos.gyp:khronos_headers', - ], 'sources': [ 'command_buffer/common/bitfield_helpers.h', 'command_buffer/common/buffer.h', diff --git a/chromium/gpu/config/dx_diag_node.cc b/chromium/gpu/config/dx_diag_node.cc index c1e84ae4088..e0902cab8cf 100644 --- a/chromium/gpu/config/dx_diag_node.cc +++ b/chromium/gpu/config/dx_diag_node.cc @@ -4,8 +4,6 @@ #include "gpu/config/dx_diag_node.h" -#if defined(OS_WIN) - namespace gpu { DxDiagNode::DxDiagNode() {} @@ -13,5 +11,3 @@ DxDiagNode::DxDiagNode() {} DxDiagNode::~DxDiagNode() {} } // namespace gpu - -#endif // defined(OS_WIN) diff --git a/chromium/gpu/config/dx_diag_node.h b/chromium/gpu/config/dx_diag_node.h index 7f77362d084..33d29b3ec79 100644 --- a/chromium/gpu/config/dx_diag_node.h +++ b/chromium/gpu/config/dx_diag_node.h @@ -8,10 +8,6 @@ #ifndef GPU_CONFIG_DX_DIAG_NODE_H_ #define GPU_CONFIG_DX_DIAG_NODE_H_ -#include "build/build_config.h" - -#if defined(OS_WIN) - #include <map> #include <string> @@ -28,6 +24,4 @@ struct GPU_EXPORT DxDiagNode { } // namespace gpu -#endif // defined(OS_WIN) - #endif // GPU_CONFIG_DX_DIAG_NODE_H_ diff --git a/chromium/gpu/gpu.gyp b/chromium/gpu/gpu.gyp index c3c9502c724..46831eef47a 100644 --- a/chromium/gpu/gpu.gyp +++ b/chromium/gpu/gpu.gyp @@ -23,9 +23,6 @@ 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', ], - 'export_dependent_settings': [ - '../third_party/khronos/khronos.gyp:khronos_headers', - ], 'defines': [ 'GLES2_IMPL_IMPLEMENTATION', ], @@ -93,9 +90,6 @@ 'command_buffer_client', 'gles2_implementation', ], - 'export_dependent_settings': [ - 'command_buffer_client', - ], 'defines': [ 'GLES2_C_LIB_IMPLEMENTATION', ], @@ -121,9 +115,6 @@ 'command_buffer_client', 'gles2_implementation_client_side_arrays_no_check', ], - 'export_dependent_settings': [ - 'command_buffer_client', - ], 'sources': [ '<@(gles2_c_lib_source_files)', ], @@ -387,9 +378,6 @@ 'gpu_config', 'gpu_ipc', ], - 'export_dependent_settings': [ - 'command_buffer_common', - ], 'sources': [ 'gpu_export.h', ], @@ -432,9 +420,6 @@ 'dependencies': [ 'command_buffer_common', ], - 'export_dependent_settings': [ - 'command_buffer_common', - ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], }, @@ -460,9 +445,6 @@ 'dependencies': [ 'command_buffer_common', ], - 'export_dependent_settings': [ - 'command_buffer_common', - ], }, { 'target_name': 'gpu_config', |