| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef CHROME_GPU_GPU_THREAD_H_ | 5 #ifndef CHROME_GPU_GPU_THREAD_H_ |
| 6 #define CHROME_GPU_GPU_THREAD_H_ | 6 #define CHROME_GPU_GPU_THREAD_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 void RemoveChannel(int renderer_id); | 28 void RemoveChannel(int renderer_id); |
| 29 | 29 |
| 30 private: | 30 private: |
| 31 // ChildThread overrides. | 31 // ChildThread overrides. |
| 32 virtual void OnControlMessageReceived(const IPC::Message& msg); | 32 virtual void OnControlMessageReceived(const IPC::Message& msg); |
| 33 | 33 |
| 34 // Message handlers. | 34 // Message handlers. |
| 35 void OnEstablishChannel(int renderer_id); | 35 void OnEstablishChannel(int renderer_id); |
| 36 void OnSynchronize(); | 36 void OnSynchronize(); |
| 37 void OnCollectGraphicsInfo(); | 37 void OnCollectGraphicsInfo(); |
| 38 #if defined(OS_MACOSX) |
| 39 void OnAcceleratedSurfaceBuffersSwappedACK( |
| 40 int renderer_id, int32 route_id, uint64 swap_buffers_count); |
| 41 #endif |
| 38 void OnCrash(); | 42 void OnCrash(); |
| 39 void OnHang(); | 43 void OnHang(); |
| 40 | 44 |
| 41 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
| 42 static void CollectDxDiagnostics(GpuThread* thread); | 46 static void CollectDxDiagnostics(GpuThread* thread); |
| 43 static void SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node); | 47 static void SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node); |
| 44 #endif | 48 #endif |
| 45 | 49 |
| 46 typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap; | 50 typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap; |
| 47 GpuChannelMap gpu_channels_; | 51 GpuChannelMap gpu_channels_; |
| 48 | 52 |
| 49 // Information about the GPU, such as device and vendor ID. | 53 // Information about the GPU, such as device and vendor ID. |
| 50 GPUInfo gpu_info_; | 54 GPUInfo gpu_info_; |
| 51 | 55 |
| 52 DISALLOW_COPY_AND_ASSIGN(GpuThread); | 56 DISALLOW_COPY_AND_ASSIGN(GpuThread); |
| 53 }; | 57 }; |
| 54 | 58 |
| 55 #endif // CHROME_GPU_GPU_THREAD_H_ | 59 #endif // CHROME_GPU_GPU_THREAD_H_ |
| OLD | NEW |