commit f9e88fbee04f83638b07546741196bd4c242ef54
author Mathias Agopian <mathias@google.com> Tue Nov 29 13:07:24 2011 -0800
committer Mathias Agopian <mathias@google.com> Tue Nov 29 13:07:40 2011 -0800
tree a0b0da85f2411f6a025637cd082f1efced6790e5
parent e11ec1df421be0b1a18fd3cf6ec23361d86ca32a

Fix build.

Revert "Add support for sending VSYNC events to the framework"

This reverts commit f3918c5bd4bc9f02f74da42995564150ca2dd382.

Change-Id: I998e3e1aa3fa310829ae973b64fe11b01f6f468f

services/surfaceflinger/DisplayHardware/DisplayHardware.h

diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.h b/services/surfaceflinger/DisplayHardware/DisplayHardware.h
index 45d4b45..f02c954 100644
--- a/services/surfaceflinger/DisplayHardware/DisplayHardware.h
+++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.h
@@ -32,7 +32,6 @@
 #include "GLExtensions.h"
 
 #include "DisplayHardware/DisplayHardwareBase.h"
-#include "DisplayHardware/VSyncBarrier.h"
 
 namespace android {
 
@@ -75,9 +74,6 @@
     uint32_t    getMaxTextureSize() const;
     uint32_t    getMaxViewportDims() const;
 
-    // waits for the next vsync and returns the timestamp of when it happened
-    nsecs_t        waitForVSync() const;
-
     uint32_t getPageFlipCount() const;
     EGLDisplay getEGLDisplay() const { return mDisplay; }
 
@@ -99,7 +95,6 @@
 private:
     void init(uint32_t displayIndex) __attribute__((noinline));
     void fini() __attribute__((noinline));
-    int32_t getDelayToNextVSyncUs(nsecs_t* timestamp) const;
 
     sp<SurfaceFlinger> mFlinger;
     EGLDisplay      mDisplay;
@@ -117,12 +112,7 @@
     mutable uint32_t mPageFlipCount;
     GLint           mMaxViewportDims[2];
     GLint           mMaxTextureSize;
-    VSyncBarrier    mVSync;
-
-    mutable Mutex   mFakeVSyncMutex;
-    mutable nsecs_t mNextFakeVSync;
-    nsecs_t         mRefreshPeriod;
-
+    
     HWComposer*     mHwc;
 
     sp<FramebufferNativeWindow> mNativeWindow;