Index: components/mus/public/interfaces/quads.mojom |
diff --git a/components/mus/public/interfaces/quads.mojom b/components/mus/public/interfaces/quads.mojom |
index 3bdb40455e28aca659db72902e03fdda69d96a89..578a59f06438c6607a65ff0a0ad3adb207cdf3e1 100644 |
--- a/components/mus/public/interfaces/quads.mojom |
+++ b/components/mus/public/interfaces/quads.mojom |
@@ -5,6 +5,7 @@ |
module mus.mojom; |
import "cc/ipc/render_pass_id.mojom"; |
+import "cc/ipc/shared_quad_state.mojom"; |
import "cc/ipc/surface_id.mojom"; |
import "ui/gfx/geometry/mojo/geometry.mojom"; |
import "ui/gfx/mojo/transform.mojom"; |
@@ -156,66 +157,6 @@ struct Quad { |
YUVVideoQuadState? yuv_video_quad_state; |
}; |
-enum SkXfermode { |
- kClear_Mode = 0, //!< [0, 0] |
- kSrc_Mode, //!< [Sa, Sc] |
- kDst_Mode, //!< [Da, Dc] |
- kSrcOver_Mode, //!< [Sa + Da - Sa*Da, Rc = Sc + (1 - Sa)*Dc] |
- kDstOver_Mode, //!< [Sa + Da - Sa*Da, Rc = Dc + (1 - Da)*Sc] |
- kSrcIn_Mode, //!< [Sa * Da, Sc * Da] |
- kDstIn_Mode, //!< [Sa * Da, Sa * Dc] |
- kSrcOut_Mode, //!< [Sa * (1 - Da), Sc * (1 - Da)] |
- kDstOut_Mode, //!< [Da * (1 - Sa), Dc * (1 - Sa)] |
- kSrcATop_Mode, //!< [Da, Sc * Da + (1 - Sa) * Dc] |
- kDstATop_Mode, //!< [Sa, Sa * Dc + Sc * (1 - Da)] |
- kXor_Mode, //!< [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc] |
- kPlus_Mode, //!< [Sa + Da, Sc + Dc] |
- kModulate_Mode, // multiplies all components (= alpha and color) |
- |
- // Following blend modes are defined in the CSS Compositing standard: |
- // https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html#blending |
- kScreen_Mode, |
- kLastCoeffMode = kScreen_Mode, |
- |
- kOverlay_Mode, |
- kDarken_Mode, |
- kLighten_Mode, |
- kColorDodge_Mode, |
- kColorBurn_Mode, |
- kHardLight_Mode, |
- kSoftLight_Mode, |
- kDifference_Mode, |
- kExclusion_Mode, |
- kMultiply_Mode, |
- kLastSeparableMode = kMultiply_Mode, |
- |
- kHue_Mode, |
- kSaturation_Mode, |
- kColor_Mode, |
- kLuminosity_Mode, |
- kLastMode = kLuminosity_Mode |
-}; |
- |
-struct SharedQuadState { |
- // mojo.Transforms quad rects into the target content space. |
- gfx.mojom.Transform quad_to_target_transform; |
- |
- // The size of the quads' originating layer in the space of the quad rects. |
- gfx.mojom.Size quad_layer_bounds; |
- |
- // The size of the visible area in the quads' originating layer, in the space |
- // of the quad rects. |
- gfx.mojom.Rect visible_quad_layer_rect; |
- |
- // This rect lives in the target content space. |
- gfx.mojom.Rect clip_rect; |
- |
- bool is_clipped; |
- float opacity; |
- SkXfermode blend_mode; |
- int32 sorting_context_id; |
-}; |
- |
struct Pass { |
cc.mojom.RenderPassId id; |
gfx.mojom.Rect output_rect; |
@@ -223,5 +164,5 @@ struct Pass { |
gfx.mojom.Transform transform_to_root_target; |
bool has_transparent_background; |
array<Quad> quads; |
- array<SharedQuadState> shared_quad_states; |
+ array<cc.mojom.SharedQuadState> shared_quad_states; |
}; |