From 8b93052b8898c34ef83c5ad399f17ca3f376aa8b Mon Sep 17 00:00:00 2001 From: "apatrick@chromium.org" Date: Thu, 16 Feb 2012 02:02:21 +0000 Subject: Revert 122205 - Allow GPU process to present to the compositing surface without the involvement of the UI thread. This is to prevent a potential deadlock and so I can revert this: https://chromiumcodereview.appspot.com/9295021 BUG=111514 Review URL: http://codereview.chromium.org/9380019 TBR=apatrick@chromium.org Review URL: https://chromiumcodereview.appspot.com/9347062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122218 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/gpu/gpu_surface_tracker.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'content/browser/gpu/gpu_surface_tracker.h') diff --git a/content/browser/gpu/gpu_surface_tracker.h b/content/browser/gpu/gpu_surface_tracker.h index a38095a..98b4eed 100644 --- a/content/browser/gpu/gpu_surface_tracker.h +++ b/content/browser/gpu/gpu_surface_tracker.h @@ -11,7 +11,6 @@ #include "base/memory/singleton.h" #include "base/synchronization/lock.h" #include "ui/gfx/native_widget_types.h" -#include "ui/gfx/size.h" // This class is responsible for managing rendering surfaces exposed to the // GPU process. Every surface gets registered to this class, and gets an ID. @@ -58,19 +57,6 @@ class GpuSurfaceTracker { // Note: This is an O(log N) lookup. gfx::GLSurfaceHandle GetSurfaceHandle(int surface_id); -#if defined(OS_WIN) && !defined(USE_AURA) - // This is a member of GpuSurfaceTracker because it holds the lock for its - // duration. This prevents the AcceleratedSurface that it posts to from being - // destroyed by the main thread during that time. This function is only called - // on the IO thread. This function only posts tasks asynchronously. If it - // were to synchronously call the UI thread, there would be a possiblity of - // deadlock. - void AsyncPresentAndAcknowledge(int surface_id, - const gfx::Size& size, - int64 surface_handle, - const base::Closure& completion_task); -#endif - // Gets the global instance of the surface tracker. Identical to Get(), but // named that way for the implementation of Singleton. static GpuSurfaceTracker* GetInstance(); -- cgit v1.1