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

Unified Diff: gpu/command_buffer/service/in_process_command_buffer.h

Issue 271763002: Clean up SyncCompositorFactory context creation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/in_process_command_buffer.h
diff --git a/gpu/command_buffer/service/in_process_command_buffer.h b/gpu/command_buffer/service/in_process_command_buffer.h
index 1b35e08c311e2ec22cf4d7ca77a16c96d0f9ec69..89bf76e114fc7b75c5de86b09cbd47140ffc32f4 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.h
+++ b/gpu/command_buffer/service/in_process_command_buffer.h
@@ -73,7 +73,7 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
// If |surface| is not NULL, use it directly; in this case, the command
// buffer gpu thread must be the same as the client thread. Otherwise create
// a new GLSurface.
- bool Initialize(scoped_refptr<gfx::GLSurface> surface,
+ bool Initialize(gfx::GLSurface* surface,
bool is_offscreen,
gfx::AcceleratedWidget window,
const gfx::Size& size,
@@ -143,6 +143,7 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
private:
struct InitializeOnGpuThreadParams {
+ gfx::GLSurface* surface;
bool is_offscreen;
gfx::AcceleratedWidget window;
const gfx::Size& size;
@@ -151,14 +152,16 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
gpu::Capabilities* capabilities; // Ouptut.
InProcessCommandBuffer* context_group;
- InitializeOnGpuThreadParams(bool is_offscreen,
+ InitializeOnGpuThreadParams(gfx::GLSurface* surface,
+ bool is_offscreen,
gfx::AcceleratedWidget window,
const gfx::Size& size,
const std::vector<int32>& attribs,
gfx::GpuPreference gpu_preference,
gpu::Capabilities* capabilities,
InProcessCommandBuffer* share_group)
- : is_offscreen(is_offscreen),
+ : surface(surface),
+ is_offscreen(is_offscreen),
window(window),
size(size),
attribs(attribs),
@@ -175,7 +178,6 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
base::Closure WrapCallback(const base::Closure& callback);
State GetStateFast();
void QueueTask(const base::Closure& task) { service_->ScheduleTask(task); }
- void CheckSequencedThread();
void RetireSyncPointOnGpuThread(uint32 sync_point);
void SignalSyncPointOnGpuThread(uint32 sync_point,
const base::Closure& callback);
@@ -221,10 +223,6 @@ class GPU_EXPORT InProcessCommandBuffer : public CommandBuffer,
scoped_ptr<StreamTextureManagerInProcess> stream_texture_manager_;
#endif
- // Only used with explicit scheduling and the gpu thread is the same as
- // the client thread.
- scoped_ptr<base::SequenceChecker> sequence_checker_;
-
base::WeakPtr<InProcessCommandBuffer> gpu_thread_weak_ptr_;
base::WeakPtrFactory<InProcessCommandBuffer> gpu_thread_weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698