diff options
| author | 2009-10-02 23:35:12 -0400 | |
|---|---|---|
| committer | 2009-10-02 23:35:12 -0400 | |
| commit | 0b7b65da2faefb418ecb43b99025ccfabf4ceb32 (patch) | |
| tree | e101cea80b6258fa478b702cfef622747f3f9e39 /libs/surfaceflinger/Buffer.h | |
| parent | 09fa0b2d73c386f69c10f2bf1f34625924b18300 (diff) | |
| parent | 0b3ad46a26dc3717260fa9347c77f673f3198606 (diff) | |
Merge change I0c4cec7e into eclair
* changes:
Attempt to fix [2152536] ANR in browser
Diffstat (limited to 'libs/surfaceflinger/Buffer.h')
| -rw-r--r-- | libs/surfaceflinger/Buffer.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libs/surfaceflinger/Buffer.h b/libs/surfaceflinger/Buffer.h index 79f4eeb6a9..203da3bba8 100644 --- a/libs/surfaceflinger/Buffer.h +++ b/libs/surfaceflinger/Buffer.h @@ -20,20 +20,11 @@ #include <stdint.h> #include <sys/types.h> -#include <hardware/gralloc.h> - -#include <utils/Atomic.h> - #include <ui/PixelFormat.h> #include <ui/Rect.h> -#include <ui/Surface.h> - #include <pixelflinger/pixelflinger.h> - -#include <private/ui/SharedBufferStack.h> #include <private/ui/SurfaceBuffer.h> -class copybit_image_t; struct android_native_buffer_t; namespace android { @@ -42,8 +33,6 @@ namespace android { // Buffer // =========================================================================== -class NativeBuffer; - class Buffer : public SurfaceBuffer { public: |