From d07958fd2d1c4134d865f4ccb056eb925aaa7d2a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 22 Jul 2015 13:47:50 -0700 Subject: Merge to XFA: Remove dead code found by Scythe. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1249643003 . (cherry picked from commit b05f1fd710496dea44b001bb905fa1c16a39bb28) Review URL: https://codereview.chromium.org/1250433003 . --- core/include/fxge/fx_dib.h | 2 -- core/include/fxge/fx_font.h | 7 ------- core/include/fxge/fx_ge.h | 2 -- 3 files changed, 11 deletions(-) (limited to 'core/include/fxge') diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index 5b8ee44369..2d7330e0c3 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -542,7 +542,6 @@ public: uint8_t* m_pScanline; uint8_t* m_pMaskScanline; FXDIB_Format m_DestFormat; - int32_t m_Status; int32_t StartQuickStretch(); @@ -598,7 +597,6 @@ protected: CFX_ImageStretcher m_Stretcher; CFX_BitmapComposer m_Composer; int m_Status; - int m_DestLeft, m_DestTop; FX_RECT m_ClipBox; FX_DWORD m_Flags; int m_AlphaFlag; diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 44e578df59..0d911c7281 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -444,13 +444,6 @@ private: CFX_MapByteStringToPtr m_SizeMap; CFX_MapPtrToPtr m_PathMap; CFX_DIBitmap* m_pBitmap; - void* m_pPlatformGraphics; - void* m_pPlatformBitmap; - void* m_hDC; - void* m_hBitmap; - void* m_hOldBitmap; - void* m_hGdiFont; - void* m_hOldGdiFont; void InitPlatform(); void DestroyPlatform(); diff --git a/core/include/fxge/fx_ge.h b/core/include/fxge/fx_ge.h index a0c0ca5a2b..fd9c148b62 100644 --- a/core/include/fxge/fx_ge.h +++ b/core/include/fxge/fx_ge.h @@ -133,8 +133,6 @@ protected: void IntersectMaskRect(FX_RECT rect, FX_RECT mask_box, CFX_DIBitmapRef Mask); }; -extern const uint8_t g_GammaRamp[256]; -extern const uint8_t g_GammaInverse[256]; #define FX_GAMMA(value) (value) #define FX_GAMMA_INVERSE(value) (value) inline FX_ARGB ArgbGamma(FX_ARGB argb) -- cgit v1.2.3