| Index: ui/gfx/color_transform.h
|
| diff --git a/ui/gfx/color_transform.h b/ui/gfx/color_transform.h
|
| index 1d99617716e6d7bc5156ca64263a46011b88354d..5368b7a6a7bb956cc0ae6fed292b1b5cf09e2975 100644
|
| --- a/ui/gfx/color_transform.h
|
| +++ b/ui/gfx/color_transform.h
|
| @@ -5,10 +5,7 @@
|
| #ifndef UI_GFX_COLOR_TRANSFORM_H_
|
| #define UI_GFX_COLOR_TRANSFORM_H_
|
|
|
| -#include <memory>
|
| -#include <stdint.h>
|
| -
|
| -#include "build/build_config.h"
|
| +#include "base/macros.h"
|
| #include "ui/gfx/color_space.h"
|
| #include "ui/gfx/geometry/point3_f.h"
|
| #include "ui/gfx/gfx_export.h"
|
| @@ -23,19 +20,23 @@ class GFX_EXPORT ColorTransform {
|
| // Channel order is XYZ, RGB or YUV.
|
| typedef Point3F TriStim;
|
|
|
| - virtual ~ColorTransform() {}
|
| + ColorTransform();
|
| + virtual ~ColorTransform();
|
|
|
| // Perform transformation of colors, |colors| is both input and output.
|
| - virtual void transform(TriStim* colors, size_t num) = 0;
|
| + virtual void Transform(TriStim* colors, size_t num) = 0;
|
| +
|
| + virtual size_t NumberOfStepsForTesting() const = 0;
|
|
|
| static std::unique_ptr<ColorTransform> NewColorTransform(
|
| const ColorSpace& from,
|
| const ColorSpace& to,
|
| Intent intent);
|
|
|
| - static float ToLinearForTesting(ColorSpace::TransferID id, float v);
|
| - static float FromLinearForTesting(ColorSpace::TransferID id, float v);
|
| + private:
|
| + DISALLOW_COPY_AND_ASSIGN(ColorTransform);
|
| };
|
| +
|
| } // namespace gfx
|
|
|
| #endif // UI_GFX_COLOR_TRANSFORM_H_
|
|
|