commit ff28e201ec0c6d620eaaa29814ab52958487dc31
author Mathias Agopian <mathias@google.com> Thu Sep 20 23:24:19 2012 -0700
committer Mathias Agopian <mathias@google.com> Fri Sep 21 14:20:35 2012 -0700
tree 2d5a08044a7fa4ec5abd42a1aff105afb55f6fb1
parent b4d18ed34e3513f3a14ea0876c7e330bee72a529

Display events now always carry the display id they happened on

Change-Id: I12de1d883c23927722bc3a71b782f0079de4e831

services/surfaceflinger/EventThread.h

diff --git a/services/surfaceflinger/EventThread.h b/services/surfaceflinger/EventThread.h
index 1c6e637..1934f98 100644
--- a/services/surfaceflinger/EventThread.h
+++ b/services/surfaceflinger/EventThread.h
@@ -23,6 +23,8 @@
 #include <gui/DisplayEventReceiver.h>
 #include <gui/IDisplayEventConnection.h>
 
+#include <hardware/hwcomposer_defs.h>
+
 #include <utils/Errors.h>
 #include <utils/threads.h>
 #include <utils/SortedVector.h>
@@ -102,9 +104,8 @@
     // protected by mLock
     SortedVector< wp<Connection> > mDisplayEventConnections;
     Vector< DisplayEventReceiver::Event > mPendingEvents;
-    nsecs_t mVSyncTimestamp;
+    DisplayEventReceiver::Event mVSyncEvent[HWC_DISPLAY_TYPES_SUPPORTED];
     bool mUseSoftwareVSync;
-    size_t mVSyncCount;
 
     // for debugging
     bool mDebugVsyncEnabled;