From 848ff96d0b3ecca7d9d3c00924aa88bfa5d7d5d5 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Tue, 22 Apr 2014 14:37:13 +0300
Subject: With tiled rendering for iOS there is no need for a "frame buffer"

The resulting dropping of the basebmp code reduces app size by 0.7 MB.

Change-Id: Id263873ed5c4bb2435d929a1319fedeedb6daa14
---
 vcl/inc/headless/svpframe.hxx | 10 +++++++---
 vcl/inc/ios/iosinst.hxx       | 15 ---------------
 2 files changed, 7 insertions(+), 18 deletions(-)

(limited to 'vcl/inc')

diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index 6a14adf6e1d2..1aec3aafae1f 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -43,8 +43,11 @@ class SvpSalFrame : public SalFrame
     std::list< SvpSalFrame* >           m_aChildren;     // List of child frames
     sal_uLong                           m_nStyle;
     bool                                m_bVisible;
-    bool                                m_bDamageTracking;
     bool                                m_bTopDown;
+#ifndef IOS
+    basebmp::BitmapDeviceSharedPtr      m_aFrame;
+    bool                                m_bDamageTracking;
+#endif
     basebmp::Format                     m_nScanlineFormat;
     long                                m_nMinWidth;
     long                                m_nMinHeight;
@@ -53,7 +56,6 @@ class SvpSalFrame : public SalFrame
 
     SystemEnvData                       m_aSystemChildData;
 
-    basebmp::BitmapDeviceSharedPtr      m_aFrame;
     std::list< SvpSalGraphics* >        m_aGraphics;
 
     static SvpSalFrame*       s_pFocusFrame;
@@ -71,7 +73,7 @@ public:
     void PostPaint(bool bImmediate) const;
     void AllocateFrame();
 
-#if defined IOS || defined ANDROID
+#if defined ANDROID
     const basebmp::BitmapDeviceSharedPtr& getDevice() const { return m_aFrame; }
 #endif
 
@@ -125,9 +127,11 @@ public:
     virtual void                UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) SAL_OVERRIDE;
     virtual void                EndSetClipRegion() SAL_OVERRIDE;
 
+#ifndef IOS
     // If enabled we can get damage notifications for regions immediately rendered to ...
     virtual void                enableDamageTracker( bool bOn = true );
     virtual void                damaged( const basegfx::B2IBox& /* rDamageRect */) {}
+#endif
 
     /*TODO: functional implementation */
     virtual void                SetScreenNumber( unsigned int nScreen ) SAL_OVERRIDE { (void)nScreen; }
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index a91b6fc98b4f..e165f139f72c 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_INC_IOS_IOSINST_HXX
 #define INCLUDED_VCL_INC_IOS_IOSINST_HXX
 
-#include <pthread.h>
-
 #include <premac.h>
 #include <CoreGraphics/CoreGraphics.h>
 #include <postmac.h>
@@ -47,17 +45,7 @@ public:
 
     SalFrame *getFocusFrame() const;
 
-    void damaged( IosSalFrame *frame,
-                  const basegfx::B2IBox& rDamageRect);
-
     // Functions scheduled to be run as "user events" in the LO thread
-    typedef struct {
-        bool done;
-        CGContextRef context;
-        CGRect rect;
-    } RenderWindowsArg;
-    DECL_LINK( RenderWindows, RenderWindowsArg* );
-
     DECL_LINK( DisplayConfigurationChanged, void* );
 
     typedef struct {
@@ -71,9 +59,6 @@ public:
         int x, y;
     } SelectionEndMoveArg;
     DECL_LINK( SelectionEndMove, SelectionEndMoveArg* );
-
-    pthread_mutex_t m_aRenderMutex;
-    pthread_cond_t m_aRenderCond;
 };
 
 #endif // INCLUDED_VCL_INC_IOS_IOSINST_HXX
-- 
cgit