diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 12:54:38 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 12:54:38 -0700 |
commit | 4926900ab54a493d236291b5a24dfa4476792182 (patch) | |
tree | e53800a0569300516c934bfccbb036ce39d98cb3 /core/src/fxge/agg/agg23/agg_pixfmt_gray.h | |
parent | eddab4425614e49146f904f00da4a664ba4b581b (diff) | |
download | pdfium-4926900ab54a493d236291b5a24dfa4476792182.tar.xz |
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
Diffstat (limited to 'core/src/fxge/agg/agg23/agg_pixfmt_gray.h')
-rw-r--r-- | core/src/fxge/agg/agg23/agg_pixfmt_gray.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h index 052a2e35d8..5a80935479 100644 --- a/core/src/fxge/agg/agg23/agg_pixfmt_gray.h +++ b/core/src/fxge/agg/agg23/agg_pixfmt_gray.h @@ -28,7 +28,7 @@ #include "agg_rendering_buffer.h" namespace agg { -template<class ColorT> struct blender_gray : public CFX_Object { +template<class ColorT> struct blender_gray { typedef ColorT color_type; typedef typename color_type::value_type value_type; typedef typename color_type::calc_type calc_type; @@ -40,7 +40,7 @@ template<class ColorT> struct blender_gray : public CFX_Object { } }; template<class Blender, unsigned Step = 1, unsigned Offset = 0> -class pixel_formats_gray : public CFX_Object +class pixel_formats_gray { public: typedef rendering_buffer::row_data row_data; |