| Index: third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
|
| index a417e1486ef3c95dab9d12e9f42b4a336d534fd9..95778d0be8823d372907c8d86ac2bf5ecf449c15 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/skia/SkiaUtils.cpp
|
| @@ -37,8 +37,8 @@
|
| namespace blink {
|
|
|
| static const struct CompositOpToXfermodeMode {
|
| - CompositeOperator m_composit_op;
|
| - SkBlendMode xfermode_mode_;
|
| + CompositeOperator composit_op;
|
| + SkBlendMode xfermode_mode;
|
| } kGMapCompositOpsToXfermodeModes[] = {
|
| {kCompositeClear, SkBlendMode::kClear},
|
| {kCompositeCopy, SkBlendMode::kSrc},
|
| @@ -98,8 +98,8 @@ SkBlendMode WebCoreCompositeToSkiaComposite(CompositeOperator op,
|
| op));
|
| return SkBlendMode::kSrcOver;
|
| }
|
| - SkASSERT(table[static_cast<uint8_t>(op)].m_composit_op == op);
|
| - return table[static_cast<uint8_t>(op)].xfermode_mode_;
|
| + SkASSERT(table[static_cast<uint8_t>(op)].composit_op == op);
|
| + return table[static_cast<uint8_t>(op)].xfermode_mode;
|
| }
|
|
|
| CompositeOperator CompositeOperatorFromSkia(SkBlendMode xfer_mode) {
|
|
|