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_rasterizer_scanline_aa.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_rasterizer_scanline_aa.h')
-rw-r--r-- | core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h index e9f0defbe8..e06322c24d 100644 --- a/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h +++ b/core/src/fxge/agg/agg23/agg_rasterizer_scanline_aa.h @@ -46,7 +46,7 @@ inline int poly_coord(FX_FLOAT c) { return int(c * poly_base_size); } -struct cell_aa : public CFX_Object { +struct cell_aa { int x; int y; int cover; @@ -56,7 +56,7 @@ struct cell_aa : public CFX_Object { void set_cover(int c, int a); void add_cover(int c, int a); }; -class outline_aa : public CFX_Object +class outline_aa { enum cell_block_scale_e { cell_block_shift = 12, @@ -65,7 +65,7 @@ class outline_aa : public CFX_Object cell_block_pool = 256, cell_block_limit = 1024 }; - struct sorted_y : public CFX_Object { + struct sorted_y { unsigned start; unsigned num; }; @@ -134,7 +134,7 @@ private: int m_max_y; bool m_sorted; }; -class scanline_hit_test : public CFX_Object +class scanline_hit_test { public: scanline_hit_test(int x) : m_x(x), m_hit(false) {} @@ -168,7 +168,7 @@ enum filling_rule_e { fill_non_zero, fill_even_odd }; -class rasterizer_scanline_aa : public CFX_Object +class rasterizer_scanline_aa { enum status { status_initial, |