diff options
| author | Mathias Agopian <mathias@google.com> | 2009-07-28 14:20:21 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-07-28 14:20:21 -0700 |
| commit | 33863dd9e1005478d20b70fad42e447ac97f5abf (patch) | |
| tree | 0092bdf625c8102ee649e4ebd41319b744b1cc86 /libs/surfaceflinger/SurfaceFlinger.h | |
| parent | 5e7d68223a1061b296871cd157b4d9e81a1777ec (diff) | |
| parent | ac38dfc5435b57281c97165e4de5b5a12af98a20 (diff) | |
| download | frameworks_base-33863dd9e1005478d20b70fad42e447ac97f5abf.zip frameworks_base-33863dd9e1005478d20b70fad42e447ac97f5abf.tar.gz frameworks_base-33863dd9e1005478d20b70fad42e447ac97f5abf.tar.bz2 | |
resolved conflicts for merge of ac38dfc5 to master
Diffstat (limited to 'libs/surfaceflinger/SurfaceFlinger.h')
| -rw-r--r-- | libs/surfaceflinger/SurfaceFlinger.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/libs/surfaceflinger/SurfaceFlinger.h index e8687a7..2569a0f 100644 --- a/libs/surfaceflinger/SurfaceFlinger.h +++ b/libs/surfaceflinger/SurfaceFlinger.h @@ -334,6 +334,7 @@ private: // Can only accessed from the main thread, these members // don't need synchronization Region mDirtyRegion; + Region mDirtyRegionRemovedLayer; Region mInvalidRegion; Region mWormholeRegion; wp<Client> mLastScheduledBroadcast; |