| Index: components/exo/wayland/server.cc
|
| diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
|
| index 7b3d47ed80040647c1ddc52cbfadf1d94d6f513a..17cadd06456e7ed19f324a91e0956fa21fb82c54 100644
|
| --- a/components/exo/wayland/server.cc
|
| +++ b/components/exo/wayland/server.cc
|
| @@ -2697,13 +2697,13 @@ class Blending : public SurfaceObserver {
|
| ~Blending() override {
|
| if (surface_) {
|
| surface_->RemoveSurfaceObserver(this);
|
| - surface_->SetBlendMode(SkXfermode::kSrcOver_Mode);
|
| + surface_->SetBlendMode(SkBlendMode::kSrcOver);
|
| surface_->SetAlpha(1.0f);
|
| surface_->SetProperty(kSurfaceHasBlendingKey, false);
|
| }
|
| }
|
|
|
| - void SetBlendMode(SkXfermode::Mode blend_mode) {
|
| + void SetBlendMode(SkBlendMode blend_mode) {
|
| if (surface_)
|
| surface_->SetBlendMode(blend_mode);
|
| }
|
| @@ -2734,11 +2734,10 @@ void blending_set_blending(wl_client* client,
|
| uint32_t equation) {
|
| switch (equation) {
|
| case ZCR_BLENDING_V1_BLENDING_EQUATION_NONE:
|
| - GetUserDataAs<Blending>(resource)->SetBlendMode(SkXfermode::kSrc_Mode);
|
| + GetUserDataAs<Blending>(resource)->SetBlendMode(SkBlendMode::kSrc);
|
| break;
|
| case ZCR_BLENDING_V1_BLENDING_EQUATION_PREMULT:
|
| - GetUserDataAs<Blending>(resource)->SetBlendMode(
|
| - SkXfermode::kSrcOver_Mode);
|
| + GetUserDataAs<Blending>(resource)->SetBlendMode(SkBlendMode::kSrcOver);
|
| break;
|
| case ZCR_BLENDING_V1_BLENDING_EQUATION_COVERAGE:
|
| NOTIMPLEMENTED();
|
|
|