| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/config/gpu_info_collector.h" | 5 #include "gpu/config/gpu_info_collector.h" |
| 6 | 6 |
| 7 // This has to be included before windows.h. | 7 // This has to be included before windows.h. |
| 8 #include "third_party/re2/src/re2/re2.h" | 8 #include "third_party/re2/src/re2/re2.h" |
| 9 | 9 |
| 10 #include <windows.h> | 10 #include <windows.h> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "base/message_loop/message_loop.h" | 24 #include "base/message_loop/message_loop.h" |
| 25 #include "base/metrics/field_trial.h" | 25 #include "base/metrics/field_trial.h" |
| 26 #include "base/metrics/histogram_macros.h" | 26 #include "base/metrics/histogram_macros.h" |
| 27 #include "base/scoped_native_library.h" | 27 #include "base/scoped_native_library.h" |
| 28 #include "base/strings/string16.h" | 28 #include "base/strings/string16.h" |
| 29 #include "base/strings/string_number_conversions.h" | 29 #include "base/strings/string_number_conversions.h" |
| 30 #include "base/strings/string_util.h" | 30 #include "base/strings/string_util.h" |
| 31 #include "base/strings/stringprintf.h" | 31 #include "base/strings/stringprintf.h" |
| 32 #include "base/strings/utf_string_conversions.h" | 32 #include "base/strings/utf_string_conversions.h" |
| 33 #include "base/threading/thread.h" | 33 #include "base/threading/thread.h" |
| 34 #include "base/threading/worker_pool.h" | |
| 35 #include "base/trace_event/trace_event.h" | 34 #include "base/trace_event/trace_event.h" |
| 36 #include "base/win/scoped_com_initializer.h" | 35 #include "base/win/scoped_com_initializer.h" |
| 37 #include "base/win/scoped_comptr.h" | 36 #include "base/win/scoped_comptr.h" |
| 38 #include "base/win/windows_version.h" | 37 #include "base/win/windows_version.h" |
| 39 #include "ui/gl/gl_implementation.h" | 38 #include "ui/gl/gl_implementation.h" |
| 40 #include "ui/gl/gl_surface_egl.h" | 39 #include "ui/gl/gl_surface_egl.h" |
| 41 | 40 |
| 42 namespace gpu { | 41 namespace gpu { |
| 43 | 42 |
| 44 namespace { | 43 namespace { |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 } | 409 } |
| 411 | 410 |
| 412 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 411 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 413 | 412 |
| 414 basic_gpu_info->dx_diagnostics_info_state = | 413 basic_gpu_info->dx_diagnostics_info_state = |
| 415 context_gpu_info.dx_diagnostics_info_state; | 414 context_gpu_info.dx_diagnostics_info_state; |
| 416 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; | 415 basic_gpu_info->dx_diagnostics = context_gpu_info.dx_diagnostics; |
| 417 } | 416 } |
| 418 | 417 |
| 419 } // namespace gpu | 418 } // namespace gpu |
| OLD | NEW |