| commit | 1c87e474d87d6d1380fb61d476d606b1a2fda1c1 | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Fri Mar 13 14:40:34 2015 -0700 |
| committer | Dan Stoza <stoza@google.com> | Fri Mar 20 12:29:04 2015 -0700 |
| tree | 8b7b36614bcc7f9280531f73dbcacea8a1d96a16 | |
| parent | 701473cf9bb1d1da2a0f55d9732d3016e1f33d59 [diff] [blame] |
DO NOT MERGE libgui: Remove IGBC::BufferItem
Removes IGraphicBufferConsumer::BufferItem. Depends on the
following changes:
I187b3a7d05196b6289596afac8fb9a9d4aebff76
I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc
Cherry-pick of Id1fa56d092188f2cb712768d5d2fc6a9027fb73c
Change-Id: I3edf0db8fba656fd78e18a5a7f1137f0fb6b237d
diff --git a/include/gui/BufferItem.h b/include/gui/BufferItem.h index 112c482..cc41bae 100644 --- a/include/gui/BufferItem.h +++ b/include/gui/BufferItem.h
@@ -20,10 +20,10 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <gui/IGraphicBufferConsumer.h> - #include <ui/Rect.h> +#include <system/graphics.h> + #include <utils/Flattenable.h> #include <utils/StrongPointer.h> @@ -44,9 +44,7 @@ // The default value of mBuf, used to indicate this doesn't correspond to a slot. enum { INVALID_BUFFER_SLOT = -1 }; BufferItem(); - BufferItem(const IGraphicBufferConsumer::BufferItem& item); ~BufferItem(); - operator IGraphicBufferConsumer::BufferItem() const; static const char* scalingModeName(uint32_t scalingMode);