diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
| download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz | |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h')
| -rw-r--r-- | core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h index 1cf817a1c7..0d8d6ff99e 100644 --- a/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h +++ b/core/src/fxge/agg/agg23/agg_conv_adaptor_vcgen.h @@ -18,7 +18,7 @@ #include "agg_basics.h" namespace agg { -struct null_markers : public CFX_Object { +struct null_markers { void remove_all() {} void add_vertex(FX_FLOAT, FX_FLOAT, unsigned) {} void prepare_src() {} @@ -30,7 +30,7 @@ struct null_markers : public CFX_Object { }; template<class VertexSource, class Generator, - class Markers = null_markers> class conv_adaptor_vcgen : public CFX_Object + class Markers = null_markers> class conv_adaptor_vcgen { enum status { initial, |