Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Unified Diff: components/exo/surface.h

Issue 2502373003: stop using SkXfermode -- use SkBlendMode instead (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/exo/shell_surface_unittest.cc ('k') | components/exo/surface.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/surface.h
diff --git a/components/exo/surface.h b/components/exo/surface.h
index 6a03b04a714fa1613c4cd06d51edee6838311e28..032cd57f8af55c8f4bda996a30ef76cbf39baa5e 100644
--- a/components/exo/surface.h
+++ b/components/exo/surface.h
@@ -18,8 +18,8 @@
#include "cc/resources/transferable_resource.h"
#include "cc/scheduler/begin_frame_source.h"
#include "cc/surfaces/surface_factory_client.h"
+#include "third_party/skia/include/core/SkBlendMode.h"
#include "third_party/skia/include/core/SkRegion.h"
-#include "third_party/skia/include/core/SkXfermode.h"
#include "ui/aura/window.h"
#include "ui/aura/window_observer.h"
#include "ui/gfx/geometry/rect.h"
@@ -153,7 +153,7 @@ class Surface : public ui::ContextFactoryObserver,
void SetOnlyVisibleOnSecureOutput(bool only_visible_on_secure_output);
// This sets the blend mode that will be used when drawing the surface.
- void SetBlendMode(SkXfermode::Mode blend_mode);
+ void SetBlendMode(SkBlendMode blend_mode);
// This sets the alpha value that will be applied to the whole surface.
void SetAlpha(float alpha);
@@ -268,7 +268,7 @@ class Surface : public ui::ContextFactoryObserver,
gfx::Size viewport;
gfx::RectF crop;
bool only_visible_on_secure_output = false;
- SkXfermode::Mode blend_mode = SkXfermode::kSrcOver_Mode;
+ SkBlendMode blend_mode = SkBlendMode::kSrcOver;
float alpha = 1.0f;
};
class BufferAttachment {
« no previous file with comments | « components/exo/shell_surface_unittest.cc ('k') | components/exo/surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698