diff options
| author | 2009-07-06 14:52:04 -0700 | |
|---|---|---|
| committer | 2009-07-06 14:52:04 -0700 | |
| commit | d8b2a6412daef032d89c23e979758f6334b62093 (patch) | |
| tree | dba55e2701d88e7bb380604520a230abb16b4b66 /cmds/bootanimation/BootAnimation.h | |
| parent | d719890cab1eec09cbf556a3b86cc02b0f0ef8d7 (diff) | |
| parent | 03a9a3449af3e0e79e9bbcd87f8057189ab9e151 (diff) | |
Merge commit 'goog/master_gl' into merge_master_gl
Diffstat (limited to 'cmds/bootanimation/BootAnimation.h')
| -rw-r--r-- | cmds/bootanimation/BootAnimation.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h index 42e9eed7d3eb..796077dc3e1d 100644 --- a/cmds/bootanimation/BootAnimation.h +++ b/cmds/bootanimation/BootAnimation.h @@ -34,7 +34,6 @@ class SkBitmap; namespace android { class AssetManager; -class EGLNativeWindowSurface; // --------------------------------------------------------------------------- @@ -68,8 +67,8 @@ private: EGLDisplay mDisplay; EGLDisplay mContext; EGLDisplay mSurface; + sp<SurfaceControl> mFlingerSurfaceControl; sp<Surface> mFlingerSurface; - sp<EGLNativeWindowSurface> mNativeWindowSurface; }; // --------------------------------------------------------------------------- |