auto import from //branches/cupcake/...@131421
diff --git a/libs/surfaceflinger/SurfaceFlinger.h b/libs/surfaceflinger/SurfaceFlinger.h
index 8e5fd88..f7d7764 100644
--- a/libs/surfaceflinger/SurfaceFlinger.h
+++ b/libs/surfaceflinger/SurfaceFlinger.h
@@ -58,7 +58,6 @@
class LayerBuffer;
class LayerOrientationAnim;
class OrientationAnimation;
-class RFBServer;
class SurfaceHeapManager;
typedef int32_t ClientID;
@@ -112,6 +111,8 @@
class GraphicPlane
{
public:
+ static status_t orientationToTransfrom(int orientation, int w, int h,
+ Transform* tr);
GraphicPlane();
~GraphicPlane();
@@ -344,7 +345,6 @@
sp<GPUHardwareInterface> mGPU;
GLuint mWormholeTexName;
sp<BootAnimation> mBootAnimation;
- sp<RFBServer> mRFBServer;
nsecs_t mBootTime;
// Can only accessed from the main thread, these members