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

Side by Side Diff: content/common/gpu/gpu_command_buffer_stub.h

Issue 6993043: Fix the mac hangup when force-compositing-mode is enabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 9 years, 6 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 5 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 6 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
7 #pragma once 7 #pragma once
8 8
9 #if defined(ENABLE_GPU) 9 #if defined(ENABLE_GPU)
10 10
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 void OnCompositorWindowPainted(); 70 void OnCompositorWindowPainted();
71 #endif // defined(OS_WIN) 71 #endif // defined(OS_WIN)
72 72
73 void ViewResized(); 73 void ViewResized();
74 74
75 #if defined(OS_MACOSX) 75 #if defined(OS_MACOSX)
76 // Called only by the GpuChannel. 76 // Called only by the GpuChannel.
77 void AcceleratedSurfaceBuffersSwapped(uint64 swap_buffers_count); 77 void AcceleratedSurfaceBuffersSwapped(uint64 swap_buffers_count);
78 #endif // defined(OS_MACOSX) 78 #endif // defined(OS_MACOSX)
79 79
80 // Called when the command buffer was destroyed, and the stub should now
81 // unblock itself and handle pending messages.
82 void CommandBufferWasDestroyed();
83
80 private: 84 private:
81 // Message handlers: 85 // Message handlers:
82 void OnInitialize(base::SharedMemoryHandle ring_buffer, 86 void OnInitialize(base::SharedMemoryHandle ring_buffer,
83 int32 size, 87 int32 size,
84 IPC::Message* reply_message); 88 IPC::Message* reply_message);
85 void OnGetState(IPC::Message* reply_message); 89 void OnGetState(IPC::Message* reply_message);
86 void OnFlush(int32 put_offset, 90 void OnFlush(int32 put_offset,
87 int32 last_known_get, 91 int32 last_known_get,
88 uint32 flush_count, 92 uint32 flush_count,
89 IPC::Message* reply_message); 93 IPC::Message* reply_message);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 143
140 GpuWatchdog* watchdog_; 144 GpuWatchdog* watchdog_;
141 ScopedRunnableMethodFactory<GpuCommandBufferStub> task_factory_; 145 ScopedRunnableMethodFactory<GpuCommandBufferStub> task_factory_;
142 146
143 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub); 147 DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
144 }; 148 };
145 149
146 #endif // defined(ENABLE_GPU) 150 #endif // defined(ENABLE_GPU)
147 151
148 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_ 152 #endif // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698