From 4926900ab54a493d236291b5a24dfa4476792182 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Apr 2015 12:54:38 -0700 Subject: Kill CFX_Object. CFX_Object is a type that implements its own new operators that return NULL on error. There's no need for this given the |new (std::nothrow)| syntax; in fact, the current code can only work if there is no activity in the constructors. This may explain the pervasive lack of constructors and reliance on Init() methods throughout the codebase. The activity takes place in fx_memory.h, where FX_NEW is mapped onto the std::nothrow syntax. The rest is just cleanup. Down the road, we will simply throw and remove all the error-checking paths for new objects. Landing this patch first will at least show a simple path back to the old behaviour without having to re-introduce CFX_Object should someone want to do so in their own fork. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1088733002 --- core/src/fxge/win32/fx_win32_dwrite.cpp | 8 ++++---- core/src/fxge/win32/fx_win32_gdipext.cpp | 2 +- core/src/fxge/win32/win32_int.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'core/src/fxge/win32') diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index 2b32d572b5..1ad4f8c457 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -26,7 +26,7 @@ inline InterfaceType* SafeAcquire(InterfaceType* newObject) } return newObject; } -class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream, public CFX_Object +class CDwFontFileStream FX_FINAL : public IDWriteFontFileStream { public: explicit CDwFontFileStream(void const* fontFileReferenceKey, UINT32 fontFileReferenceKeySize); @@ -46,7 +46,7 @@ private: void const* resourcePtr_; DWORD resourceSize_; }; -class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader, public CFX_Object +class CDwFontFileLoader FX_FINAL : public IDWriteFontFileLoader { public: virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, void** ppvObject); @@ -71,7 +71,7 @@ private: ULONG refCount_; static IDWriteFontFileLoader* instance_; }; -class CDwFontContext : public CFX_Object +class CDwFontContext { public: CDwFontContext(IDWriteFactory* dwriteFactory); @@ -83,7 +83,7 @@ private: HRESULT hr_; IDWriteFactory* dwriteFactory_; }; -class CDwGdiTextRenderer : public CFX_Object +class CDwGdiTextRenderer { public: CDwGdiTextRenderer( diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 0f13721c70..e668b49200 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -1008,7 +1008,7 @@ BOOL CGdiplusExt::DrawPath(HDC hDC, const CFX_PathData* pPathData, CallFunc(GdipDeleteGraphics)(pGraphics); return TRUE; } -class GpStream FX_FINAL : public IStream, public CFX_Object +class GpStream FX_FINAL : public IStream { LONG m_RefCount; int m_ReadPos; diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h index 83595cbf8d..bc3eb878d9 100644 --- a/core/src/fxge/win32/win32_int.h +++ b/core/src/fxge/win32/win32_int.h @@ -58,7 +58,7 @@ protected: HMODULE m_GdiModule; }; #include "dwrite_int.h" -class CWin32Platform : public CFX_Object +class CWin32Platform { public: FX_BOOL m_bHalfTone; @@ -164,7 +164,7 @@ protected: int m_HorzSize, m_VertSize; FX_BOOL m_bSupportROP; }; -class CPSOutput : public IFX_PSOutput, public CFX_Object +class CPSOutput : public IFX_PSOutput { public: CPSOutput(HDC hDC); -- cgit v1.2.3