Backed out changeset da5d5eb153f2 (bug 1582273) for causing tidy bustages. CLOSED TREE

gfx/webrender_bindings/WebRenderAPI.h

@@ -336,17 +336,16 @@ class MOZ_RAII AutoTransactionSender {
  */
 struct MOZ_STACK_CLASS StackingContextParams : public WrStackingContextParams {
   StackingContextParams()
-      : WrStackingContextParams{
-            WrStackingContextClip::None(),
-            nullptr,
-            nullptr,
-            wr::TransformStyle::Flat,
-            wr::WrReferenceFrameKind::Transform,
-            nullptr,
-            /* prim_flags = */ wr::PrimitiveFlags_IS_BACKFACE_VISIBLE,
-            /* cache_tiles = */ false,
-            wr::MixBlendMode::Normal,
-            /* is_backdrop_root = */ false} {}
+      : WrStackingContextParams{WrStackingContextClip::None(),
+                                nullptr,
+                                nullptr,
+                                wr::TransformStyle::Flat,
+                                wr::WrReferenceFrameKind::Transform,
+                                nullptr,
+                                /* is_backface_visible = */ true,
+                                /* cache_tiles = */ false,
+                                wr::MixBlendMode::Normal,
+                                /* is_backdrop_root = */ false} {}
 
   void SetPreserve3D(bool aPreserve) {
     transform_style =

gfx/webrender_bindings/src/bindings.rs

@@ -2065,7 +2065,7 @@ pub struct WrStackingContextParams {
     pub transform_style: TransformStyle,
     pub reference_frame_kind: WrReferenceFrameKind,
     pub scrolling_relative_to: *const u64,
-    pub prim_flags: PrimitiveFlags,
+    pub is_backface_visible: bool,
     /// True if picture caching should be enabled for this stacking context.
     pub cache_tiles: bool,
     pub mix_blend_mode: MixBlendMode,
@@ -2185,7 +2185,7 @@ pub extern "C" fn wr_dp_push_stacking_context(
          .dl_builder
          .push_stacking_context(bounds.origin,
                                 wr_spatial_id,
-                                params.prim_flags,
+                                params.is_backface_visible,
                                 wr_clip_id,
                                 params.transform_style,
                                 params.mix_blend_mode,

gfx/wr/examples/alpha_perf.rs

@@ -37,7 +37,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         for _ in 0 .. self.rect_count {

gfx/wr/examples/animation.rs

@@ -68,7 +68,7 @@ impl App {
         builder.push_simple_stacking_context_with_filters(
             LayoutPoint::zero(),
             spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
             &filters,
             &[],
             &[]

gfx/wr/examples/basic.rs

@@ -197,7 +197,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             content_bounds.origin,
             spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         let image_mask_key = api.generate_image_key();

gfx/wr/examples/blob.rs

@@ -16,7 +16,7 @@ use rayon::{ThreadPool, ThreadPoolBuilder};
 use rayon::prelude::*;
 use std::collections::HashMap;
 use std::sync::Arc;
-use webrender::api::{self, DisplayListBuilder, DocumentId, PipelineId, PrimitiveFlags, RenderApi, Transaction};
+use webrender::api::{self, DisplayListBuilder, DocumentId, PipelineId, RenderApi, Transaction};
 use webrender::api::{ColorF, CommonItemProperties, SpaceAndClipInfo};
 use webrender::api::units::*;
 use webrender::euclid::{size2, rect};
@@ -229,7 +229,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             LayoutPoint::zero(),
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         let bounds = (30, 30).by(500, 500);

gfx/wr/examples/document.rs

@@ -118,7 +118,7 @@ impl Example for App {
             builder.push_simple_stacking_context(
                 doc.content_rect.origin,
                 space_and_clip.spatial_id,
-                PrimitiveFlags::IS_BACKFACE_VISIBLE,
+                true,
             );
             builder.push_rect(
                 &CommonItemProperties::new(local_rect, space_and_clip),

gfx/wr/examples/frame_output.rs

@@ -119,7 +119,7 @@ impl App {
         builder.push_simple_stacking_context(
             document.content_rect.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         builder.push_rect(
@@ -164,7 +164,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         builder.push_image(

gfx/wr/examples/iframe.rs

@@ -41,7 +41,7 @@ impl Example for App {
         sub_builder.push_simple_stacking_context(
             sub_bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         // green rect visible == success
@@ -73,7 +73,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             sub_bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         // red rect under the iframe: if this is visible, things have gone wrong

gfx/wr/examples/image_resize.rs

@@ -44,7 +44,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         let image_size = LayoutSize::new(100.0, 100.0);

gfx/wr/examples/multiwindow.rs

@@ -190,7 +190,7 @@ impl Window {
         builder.push_simple_stacking_context(
             bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         builder.push_rect(

gfx/wr/examples/scrolling.rs

@@ -36,7 +36,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             LayoutPoint::zero(),
             root_space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         if true {
@@ -46,7 +46,7 @@ impl Example for App {
             builder.push_simple_stacking_context(
                 LayoutPoint::new(10., 10.),
                 root_space_and_clip.spatial_id,
-                PrimitiveFlags::IS_BACKFACE_VISIBLE,
+                true,
             );
             // set the scrolling clip
             let space_and_clip1 = builder.define_scroll_frame(

gfx/wr/examples/texture_cache_stress.rs

@@ -102,7 +102,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         let x0 = 50.0;

gfx/wr/examples/yuv.rs

@@ -99,7 +99,7 @@ impl Example for App {
         builder.push_simple_stacking_context(
             bounds.origin,
             space_and_clip.spatial_id,
-            PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            true,
         );
 
         let yuv_chanel1 = api.generate_image_key();

gfx/wr/webrender/src/scene_building.rs

@@ -361,7 +361,7 @@ impl<'a> SceneBuilder<'a> {
             root_pipeline.pipeline_id,
             CompositeOps::default(),
             TransformStyle::Flat,
-            /* prim_flags = */ PrimitiveFlags::IS_BACKFACE_VISIBLE,
+            /* is_backface_visible = */ true,
             /* create_tile_cache = */ false,
             ROOT_SPATIAL_NODE_INDEX,
             ClipChainId::NONE,
@@ -912,7 +912,7 @@ impl<'a> SceneBuilder<'a> {
         filters: ItemRange<FilterOp>,
         filter_datas: &[TempFilterData],
         filter_primitives: ItemRange<FilterPrimitive>,
-        prim_flags: PrimitiveFlags,
+        is_backface_visible: bool,
         apply_pipeline_clip: bool,
     ) {
         // Avoid doing unnecessary work for empty stacking contexts.
@@ -939,7 +939,7 @@ impl<'a> SceneBuilder<'a> {
             pipeline_id,
             composition_operations,
             stacking_context.transform_style,
-            prim_flags,
+            is_backface_visible,
             stacking_context.cache_tiles,
             spatial_node_index,
             clip_chain_id,
@@ -1373,7 +1373,7 @@ impl<'a> SceneBuilder<'a> {
                     item.filters(),
                     item.filter_datas(),
                     item.filter_primitives(),
-                    info.prim_flags,
+                    info.is_backface_visible,
                     apply_pipeline_clip,
                 );
                 return Some(subtraversal);
@@ -1771,7 +1771,7 @@ impl<'a> SceneBuilder<'a> {
         pipeline_id: PipelineId,
         composite_ops: CompositeOps,
         transform_style: TransformStyle,
-        prim_flags: PrimitiveFlags,
+        is_backface_visible: bool,
         create_tile_cache: bool,
         spatial_node_index: SpatialNodeIndex,
         clip_chain_id: ClipChainId,
@@ -1895,6 +1895,12 @@ impl<'a> SceneBuilder<'a> {
             |sc| sc.snap_to_device.clone(),
         );
 
+        let prim_flags = if is_backface_visible {
+            PrimitiveFlags::IS_BACKFACE_VISIBLE
+        } else {
+            PrimitiveFlags::empty()
+        };
+
         // Push the SC onto the stack, so we know how to handle things in
         // pop_stacking_context.
         self.sc_stack.push(FlattenedStackingContext {

gfx/wr/webrender_api/src/display_item.rs

@@ -34,15 +34,12 @@ pub const MAX_BLUR_RADIUS: f32 = 300.;
 pub type ItemTag = (u64, u16);
 
 bitflags! {
-    #[repr(C)]
     #[derive(Deserialize, MallocSizeOf, Serialize, PeekPoke)]
     pub struct PrimitiveFlags: u8 {
         /// The CSS backface-visibility property (yes, it can be really granular)
         const IS_BACKFACE_VISIBLE = 1 << 0;
-        /// If set, this primitive represents a scroll bar container
-        const IS_SCROLLBAR_CONTAINER = 1 << 1;
-        /// If set, this primitive represents a scroll bar thumb
-        const IS_SCROLLBAR_THUMB = 1 << 2;
+        /// If set, this primitive represents part of a scroll bar
+        const IS_SCROLL_BAR = 1 << 1;
     }
 }
 
@@ -673,7 +670,7 @@ pub struct ReferenceFrame {
 pub struct PushStackingContextDisplayItem {
     pub origin: LayoutPoint,
     pub spatial_id: SpatialId,
-    pub prim_flags: PrimitiveFlags,
+    pub is_backface_visible: bool,
     pub stacking_context: StackingContext,
 }
 

gfx/wr/webrender_api/src/display_list.rs

@@ -1254,7 +1254,7 @@ impl DisplayListBuilder {
         &mut self,
         origin: LayoutPoint,
         spatial_id: di::SpatialId,
-        prim_flags: di::PrimitiveFlags,
+        is_backface_visible: bool,
         clip_id: Option<di::ClipId>,
         transform_style: di::TransformStyle,
         mix_blend_mode: di::MixBlendMode,
@@ -1270,7 +1270,7 @@ impl DisplayListBuilder {
         let item = di::DisplayItem::PushStackingContext(di::PushStackingContextDisplayItem {
             origin,
             spatial_id,
-            prim_flags,
+            is_backface_visible,
             stacking_context: di::StackingContext {
                 transform_style,
                 mix_blend_mode,
@@ -1289,12 +1289,12 @@ impl DisplayListBuilder {
         &mut self,
         origin: LayoutPoint,
         spatial_id: di::SpatialId,
-        prim_flags: di::PrimitiveFlags,
+        is_backface_visible: bool,
     ) {
         self.push_simple_stacking_context_with_filters(
             origin,
             spatial_id,
-            prim_flags,
+            is_backface_visible,
             &[],
             &[],
             &[],
@@ -1306,7 +1306,7 @@ impl DisplayListBuilder {
         &mut self,
         origin: LayoutPoint,
         spatial_id: di::SpatialId,
-        prim_flags: di::PrimitiveFlags,
+        is_backface_visible: bool,
         filters: &[di::FilterOp],
         filter_datas: &[di::FilterData],
         filter_primitives: &[di::FilterPrimitive],
@@ -1314,7 +1314,7 @@ impl DisplayListBuilder {
         self.push_stacking_context(
             origin,
             spatial_id,
-            prim_flags,
+            is_backface_visible,
             None,
             di::TransformStyle::Flat,
             di::MixBlendMode::Normal,

gfx/wr/wrench/src/yaml_frame_reader.rs

@@ -2035,7 +2035,7 @@ impl YamlFrameReader {
         dl.push_stacking_context(
             bounds.origin,
             *self.spatial_id_stack.last().unwrap(),
-            info.flags,
+            info.flags.contains(PrimitiveFlags::IS_BACKFACE_VISIBLE),
             clip_node_id,
             transform_style,
             mix_blend_mode,

gfx/wr/wrench/src/yaml_frame_writer.rs

@@ -204,8 +204,6 @@ fn maybe_radius_yaml(radius: &BorderRadius) -> Option<Yaml> {
 fn common_node(v: &mut Table, clip_id_mapper: &mut ClipIdMapper, info: &CommonItemProperties) {
     rect_node(v, "clip-rect", &info.clip_rect);
     bool_node(v, "backface-visible", info.flags.contains(PrimitiveFlags::IS_BACKFACE_VISIBLE));
-    bool_node(v, "scrollbar-container", info.flags.contains(PrimitiveFlags::IS_SCROLLBAR_CONTAINER));
-    bool_node(v, "scrollbar-thumb", info.flags.contains(PrimitiveFlags::IS_SCROLLBAR_THUMB));
 
     clip_and_scroll_node(v, clip_id_mapper, info.clip_id, info.spatial_id);
 
@@ -1295,9 +1293,7 @@ impl YamlFrameWriter {
                         item.spatial_id
                     );
                     point_node(&mut v, "origin", &item.origin);
-                    bool_node(&mut v, "backface-visible", item.prim_flags.contains(PrimitiveFlags::IS_BACKFACE_VISIBLE));
-                    bool_node(&mut v, "scrollbar-container", item.prim_flags.contains(PrimitiveFlags::IS_SCROLLBAR_CONTAINER));
-                    bool_node(&mut v, "scrollbar-thumb", item.prim_flags.contains(PrimitiveFlags::IS_SCROLLBAR_THUMB));
+                    bool_node(&mut v, "backface-visible", item.is_backface_visible);
                     write_stacking_context(
                         &mut v,
                         &item.stacking_context,

layout/painting/nsDisplayList.cpp

@@ -6941,12 +6941,6 @@ bool nsDisplayOwnLayer::CreateWebRenderCommands(
   params.animation = prop.ptrOr(nullptr);
   params.clip =
       wr::WrStackingContextClip::ClipChain(aBuilder.CurrentClipChainId());
-  if (IsScrollbarContainer()) {
-    params.prim_flags |= wr::PrimitiveFlags_IS_SCROLLBAR_CONTAINER;
-  }
-  if (IsScrollThumbLayer()) {
-    params.prim_flags |= wr::PrimitiveFlags_IS_SCROLLBAR_THUMB;
-  }
   StackingContextHelper sc(aSc, GetActiveScrolledRoot(), mFrame, this, aBuilder,
                            params);
 
@@ -8632,9 +8626,7 @@ bool nsDisplayTransform::CreateWebRenderCommands(
   params.mBoundTransform = &newTransformMatrix;
   params.animation = animationsId ? &prop : nullptr;
   params.mTransformPtr = transformForSC;
-  params.prim_flags = !BackfaceIsHidden()
-                          ? wr::PrimitiveFlags_IS_BACKFACE_VISIBLE
-                          : wr::PrimitiveFlags{0};
+  params.is_backface_visible = !BackfaceIsHidden();
   params.mDeferredTransformItem = deferredTransformItem;
   params.mAnimated = animated;
   // Determine if we would have to rasterize any items in local raster space
@@ -9337,9 +9329,7 @@ bool nsDisplayPerspective::CreateWebRenderCommands(
   wr::StackingContextParams params;
   params.mTransformPtr = &perspectiveMatrix;
   params.reference_frame_kind = wr::WrReferenceFrameKind::Perspective;
-  params.prim_flags = !BackfaceIsHidden()
-                          ? wr::PrimitiveFlags_IS_BACKFACE_VISIBLE
-                          : wr::PrimitiveFlags{0};
+  params.is_backface_visible = !BackfaceIsHidden();
   params.SetPreserve3D(preserve3D);
   params.clip =
       wr::WrStackingContextClip::ClipChain(aBuilder.CurrentClipChainId());