Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: chrome/gpu/gpu_thread.h

Issue 6076005: Mac: Don't hang gpu process on popup close under certain conditions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome
Patch Set: final touches Created 9 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 25 matching lines...) Expand all
36 virtual void OnControlMessageReceived(const IPC::Message& msg); 36 virtual void OnControlMessageReceived(const IPC::Message& msg);
37 37
38 // Message handlers. 38 // Message handlers.
39 void OnEstablishChannel(int renderer_id); 39 void OnEstablishChannel(int renderer_id);
40 void OnCloseChannel(const IPC::ChannelHandle& channel_handle); 40 void OnCloseChannel(const IPC::ChannelHandle& channel_handle);
41 void OnSynchronize(); 41 void OnSynchronize();
42 void OnCollectGraphicsInfo(); 42 void OnCollectGraphicsInfo();
43 #if defined(OS_MACOSX) 43 #if defined(OS_MACOSX)
44 void OnAcceleratedSurfaceBuffersSwappedACK( 44 void OnAcceleratedSurfaceBuffersSwappedACK(
45 int renderer_id, int32 route_id, uint64 swap_buffers_count); 45 int renderer_id, int32 route_id, uint64 swap_buffers_count);
46 void OnDidDestroySurface(int renderer_id, int32 renderer_route_id);
46 #endif 47 #endif
47 void OnCrash(); 48 void OnCrash();
48 void OnHang(); 49 void OnHang();
49 50
50 #if defined(OS_WIN) 51 #if defined(OS_WIN)
51 static void CollectDxDiagnostics(GpuThread* thread); 52 static void CollectDxDiagnostics(GpuThread* thread);
52 static void SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node); 53 static void SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node);
53 #endif 54 #endif
54 55
55 typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap; 56 typedef base::hash_map<int, scoped_refptr<GpuChannel> > GpuChannelMap;
56 GpuChannelMap gpu_channels_; 57 GpuChannelMap gpu_channels_;
57 58
58 // Information about the GPU, such as device and vendor ID. 59 // Information about the GPU, such as device and vendor ID.
59 GPUInfo gpu_info_; 60 GPUInfo gpu_info_;
60 61
61 DISALLOW_COPY_AND_ASSIGN(GpuThread); 62 DISALLOW_COPY_AND_ASSIGN(GpuThread);
62 }; 63 };
63 64
64 #endif // CHROME_GPU_GPU_THREAD_H_ 65 #endif // CHROME_GPU_GPU_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698