Address review comments

Author: gw3583

webrender/src/border.rs

@@ -1128,169 +1128,171 @@ pub fn build_border_instances(
     instances
 }
 
-pub fn create_nine_patch_segments(
-    rect: &LayoutRect,
-    nine_patch: &NinePatchDescriptor,
-) -> Vec<BrushSegment> {
-    // Calculate the modified rect as specific by border-image-outset
-    let origin = LayoutPoint::new(
-        rect.origin.x - nine_patch.outset.left,
-        rect.origin.y - nine_patch.outset.top,
-    );
-    let size = LayoutSize::new(
-        rect.size.width + nine_patch.outset.left + nine_patch.outset.right,
-        rect.size.height + nine_patch.outset.top + nine_patch.outset.bottom,
-    );
-    let rect = LayoutRect::new(origin, size);
-
-    // Calculate the local texel coords of the slices.
-    let px0 = 0.0;
-    let px1 = nine_patch.slice.left as f32;
-    let px2 = nine_patch.width as f32 - nine_patch.slice.right as f32;
-    let px3 = nine_patch.width as f32;
+impl NinePatchDescriptor {
+    pub fn create_segments(
+        &self,
+        rect: &LayoutRect,
+    ) -> Vec<BrushSegment> {
+        // Calculate the modified rect as specific by border-image-outset
+        let origin = LayoutPoint::new(
+            rect.origin.x - self.outset.left,
+            rect.origin.y - self.outset.top,
+        );
+        let size = LayoutSize::new(
+            rect.size.width + self.outset.left + self.outset.right,
+            rect.size.height + self.outset.top + self.outset.bottom,
+        );
+        let rect = LayoutRect::new(origin, size);
 
-    let py0 = 0.0;
-    let py1 = nine_patch.slice.top as f32;
-    let py2 = nine_patch.height as f32 - nine_patch.slice.bottom as f32;
-    let py3 = nine_patch.height as f32;
+        // Calculate the local texel coords of the slices.
+        let px0 = 0.0;
+        let px1 = self.slice.left as f32;
+        let px2 = self.width as f32 - self.slice.right as f32;
+        let px3 = self.width as f32;
 
-    let tl_outer = LayoutPoint::new(rect.origin.x, rect.origin.y);
-    let tl_inner = tl_outer + vec2(nine_patch.widths.left, nine_patch.widths.top);
+        let py0 = 0.0;
+        let py1 = self.slice.top as f32;
+        let py2 = self.height as f32 - self.slice.bottom as f32;
+        let py3 = self.height as f32;
 
-    let tr_outer = LayoutPoint::new(rect.origin.x + rect.size.width, rect.origin.y);
-    let tr_inner = tr_outer + vec2(-nine_patch.widths.right, nine_patch.widths.top);
+        let tl_outer = LayoutPoint::new(rect.origin.x, rect.origin.y);
+        let tl_inner = tl_outer + vec2(self.widths.left, self.widths.top);
 
-    let bl_outer = LayoutPoint::new(rect.origin.x, rect.origin.y + rect.size.height);
-    let bl_inner = bl_outer + vec2(nine_patch.widths.left, -nine_patch.widths.bottom);
+        let tr_outer = LayoutPoint::new(rect.origin.x + rect.size.width, rect.origin.y);
+        let tr_inner = tr_outer + vec2(-self.widths.right, self.widths.top);
 
-    let br_outer = LayoutPoint::new(
-        rect.origin.x + rect.size.width,
-        rect.origin.y + rect.size.height,
-    );
-    let br_inner = br_outer - vec2(nine_patch.widths.right, nine_patch.widths.bottom);
-
-    fn add_segment(
-        segments: &mut Vec<BrushSegment>,
-        rect: LayoutRect,
-        uv_rect: TexelRect,
-        repeat_horizontal: RepeatMode,
-        repeat_vertical: RepeatMode
-    ) {
-        if uv_rect.uv1.x > uv_rect.uv0.x &&
-           uv_rect.uv1.y > uv_rect.uv0.y {
-
-            // Use segment relative interpolation for all
-            // instances in this primitive.
-            let mut brush_flags =
-                BrushFlags::SEGMENT_RELATIVE |
-                BrushFlags::SEGMENT_TEXEL_RECT;
-
-            // Enable repeat modes on the segment.
-            if repeat_horizontal == RepeatMode::Repeat {
-                brush_flags |= BrushFlags::SEGMENT_REPEAT_X;
-            }
-            if repeat_vertical == RepeatMode::Repeat {
-                brush_flags |= BrushFlags::SEGMENT_REPEAT_Y;
-            }
+        let bl_outer = LayoutPoint::new(rect.origin.x, rect.origin.y + rect.size.height);
+        let bl_inner = bl_outer + vec2(self.widths.left, -self.widths.bottom);
 
-            let segment = BrushSegment::new(
-                rect,
-                true,
-                EdgeAaSegmentMask::empty(),
-                [
-                    uv_rect.uv0.x,
-                    uv_rect.uv0.y,
-                    uv_rect.uv1.x,
-                    uv_rect.uv1.y,
-                ],
-                brush_flags,
-            );
+        let br_outer = LayoutPoint::new(
+            rect.origin.x + rect.size.width,
+            rect.origin.y + rect.size.height,
+        );
+        let br_inner = br_outer - vec2(self.widths.right, self.widths.bottom);
+
+        fn add_segment(
+            segments: &mut Vec<BrushSegment>,
+            rect: LayoutRect,
+            uv_rect: TexelRect,
+            repeat_horizontal: RepeatMode,
+            repeat_vertical: RepeatMode
+        ) {
+            if uv_rect.uv1.x > uv_rect.uv0.x &&
+               uv_rect.uv1.y > uv_rect.uv0.y {
+
+                // Use segment relative interpolation for all
+                // instances in this primitive.
+                let mut brush_flags =
+                    BrushFlags::SEGMENT_RELATIVE |
+                    BrushFlags::SEGMENT_TEXEL_RECT;
+
+                // Enable repeat modes on the segment.
+                if repeat_horizontal == RepeatMode::Repeat {
+                    brush_flags |= BrushFlags::SEGMENT_REPEAT_X;
+                }
+                if repeat_vertical == RepeatMode::Repeat {
+                    brush_flags |= BrushFlags::SEGMENT_REPEAT_Y;
+                }
 
-            segments.push(segment);
+                let segment = BrushSegment::new(
+                    rect,
+                    true,
+                    EdgeAaSegmentMask::empty(),
+                    [
+                        uv_rect.uv0.x,
+                        uv_rect.uv0.y,
+                        uv_rect.uv1.x,
+                        uv_rect.uv1.y,
+                    ],
+                    brush_flags,
+                );
+
+                segments.push(segment);
+            }
         }
-    }
 
-    // Build the list of image segments
-    let mut segments = Vec::new();
+        // Build the list of image segments
+        let mut segments = Vec::new();
 
-    // Top left
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(tl_outer.x, tl_outer.y, tl_inner.x, tl_inner.y),
-        TexelRect::new(px0, py0, px1, py1),
-        RepeatMode::Stretch,
-        RepeatMode::Stretch
-    );
-    // Top right
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(tr_inner.x, tr_outer.y, tr_outer.x, tr_inner.y),
-        TexelRect::new(px2, py0, px3, py1),
-        RepeatMode::Stretch,
-        RepeatMode::Stretch
-    );
-    // Bottom right
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(br_inner.x, br_inner.y, br_outer.x, br_outer.y),
-        TexelRect::new(px2, py2, px3, py3),
-        RepeatMode::Stretch,
-        RepeatMode::Stretch
-    );
-    // Bottom left
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(bl_outer.x, bl_inner.y, bl_inner.x, bl_outer.y),
-        TexelRect::new(px0, py2, px1, py3),
-        RepeatMode::Stretch,
-        RepeatMode::Stretch
-    );
-
-    // Center
-    if nine_patch.fill {
+        // Top left
         add_segment(
             &mut segments,
-            LayoutRect::from_floats(tl_inner.x, tl_inner.y, tr_inner.x, bl_inner.y),
-            TexelRect::new(px1, py1, px2, py2),
-            nine_patch.repeat_horizontal,
-            nine_patch.repeat_vertical
+            LayoutRect::from_floats(tl_outer.x, tl_outer.y, tl_inner.x, tl_inner.y),
+            TexelRect::new(px0, py0, px1, py1),
+            RepeatMode::Stretch,
+            RepeatMode::Stretch
+        );
+        // Top right
+        add_segment(
+            &mut segments,
+            LayoutRect::from_floats(tr_inner.x, tr_outer.y, tr_outer.x, tr_inner.y),
+            TexelRect::new(px2, py0, px3, py1),
+            RepeatMode::Stretch,
+            RepeatMode::Stretch
+        );
+        // Bottom right
+        add_segment(
+            &mut segments,
+            LayoutRect::from_floats(br_inner.x, br_inner.y, br_outer.x, br_outer.y),
+            TexelRect::new(px2, py2, px3, py3),
+            RepeatMode::Stretch,
+            RepeatMode::Stretch
+        );
+        // Bottom left
+        add_segment(
+            &mut segments,
+            LayoutRect::from_floats(bl_outer.x, bl_inner.y, bl_inner.x, bl_outer.y),
+            TexelRect::new(px0, py2, px1, py3),
+            RepeatMode::Stretch,
+            RepeatMode::Stretch
         );
-    }
 
-    // Add edge segments.
+        // Center
+        if self.fill {
+            add_segment(
+                &mut segments,
+                LayoutRect::from_floats(tl_inner.x, tl_inner.y, tr_inner.x, bl_inner.y),
+                TexelRect::new(px1, py1, px2, py2),
+                self.repeat_horizontal,
+                self.repeat_vertical
+            );
+        }
 
-    // Top
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(tl_inner.x, tl_outer.y, tr_inner.x, tl_inner.y),
-        TexelRect::new(px1, py0, px2, py1),
-        nine_patch.repeat_horizontal,
-        RepeatMode::Stretch,
-    );
-    // Bottom
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(bl_inner.x, bl_inner.y, br_inner.x, bl_outer.y),
-        TexelRect::new(px1, py2, px2, py3),
-        nine_patch.repeat_horizontal,
-        RepeatMode::Stretch,
-    );
-    // Left
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(tl_outer.x, tl_inner.y, tl_inner.x, bl_inner.y),
-        TexelRect::new(px0, py1, px1, py2),
-        RepeatMode::Stretch,
-        nine_patch.repeat_vertical,
-    );
-    // Right
-    add_segment(
-        &mut segments,
-        LayoutRect::from_floats(tr_inner.x, tr_inner.y, br_outer.x, br_inner.y),
-        TexelRect::new(px2, py1, px3, py2),
-        RepeatMode::Stretch,
-        nine_patch.repeat_vertical,
-    );
+        // Add edge segments.
 
-    segments
+        // Top
+        add_segment(
+            &mut segments,
+            LayoutRect::from_floats(tl_inner.x, tl_outer.y, tr_inner.x, tl_inner.y),
+            TexelRect::new(px1, py0, px2, py1),
+            self.repeat_horizontal,
+            RepeatMode::Stretch,
+        );
+        // Bottom
+        add_segment(
+            &mut segments,
+            LayoutRect::from_floats(bl_inner.x, bl_inner.y, br_inner.x, bl_outer.y),
+            TexelRect::new(px1, py2, px2, py3),
+            self.repeat_horizontal,
+            RepeatMode::Stretch,
+        );
+        // Left
+        add_segment(
+            &mut segments,
+            LayoutRect::from_floats(tl_outer.x, tl_inner.y, tl_inner.x, bl_inner.y),
+            TexelRect::new(px0, py1, px1, py2),
+            RepeatMode::Stretch,
+            self.repeat_vertical,
+        );
+        // Right
+        add_segment(
+            &mut segments,
+            LayoutRect::from_floats(tr_inner.x, tr_inner.y, br_outer.x, br_inner.y),
+            TexelRect::new(px2, py1, px3, py2),
+            RepeatMode::Stretch,
+            self.repeat_vertical,
+        );
+
+        segments
+    }
 }

webrender/src/display_list_flattener.rs

@@ -13,7 +13,6 @@ use api::{LineOrientation, LineStyle, NinePatchBorderSource, PipelineId};
 use api::{PropertyBinding, ReferenceFrame, ScrollFrameDisplayItem, ScrollSensitivity};
 use api::{Shadow, SpecificDisplayItem, StackingContext, StickyFrameDisplayItem, TexelRect};
 use api::{ClipMode, TransformStyle, YuvColorSpace, YuvData};
-use border::create_nine_patch_segments;
 use clip::{ClipChainId, ClipRegion, ClipItemKey, ClipStore, ClipItemSceneData};
 use clip_scroll_tree::{ROOT_SPATIAL_NODE_INDEX, ClipScrollTree, SpatialNodeIndex};
 use frame_builder::{ChasePrimitive, FrameBuilder, FrameBuilderConfig};
@@ -1794,10 +1793,7 @@ impl<'a> DisplayListFlattener<'a> {
                             LayoutSize::zero(),
                         );
 
-                        let segments = create_nine_patch_segments(
-                            &info.rect,
-                            &nine_patch,
-                        );
+                        let segments = nine_patch.create_segments(&info.rect);
 
                         let descriptor = BrushSegmentDescriptor {
                             segments: SmallVec::from_vec(segments),

webrender/src/prim_store.rs

@@ -11,7 +11,7 @@ use api::{DeviceIntSideOffsets, WorldPixel, BoxShadowClipMode, NormalBorder, Wor
 use api::{PicturePixel, RasterPixel, ColorDepth, LineStyle, LineOrientation, LayoutSizeAu, AuHelpers, LayoutVector2DAu};
 use app_units::Au;
 use border::{get_max_scale_for_border, build_border_instances, create_border_segments};
-use border::{create_nine_patch_segments, BorderSegmentCacheKey, NormalBorderAu};
+use border::{BorderSegmentCacheKey, NormalBorderAu};
 use clip::{ClipStore};
 use clip_scroll_tree::{ClipScrollTree, SpatialNodeIndex};
 use clip::{ClipDataStore, ClipNodeFlags, ClipChainId, ClipChainInstance, ClipItem, ClipNodeCollector};
@@ -804,10 +804,7 @@ impl PrimitiveKeyKind {
                 ref nine_patch,
                 ..
             } => {
-                let brush_segments = create_nine_patch_segments(
-                    rect,
-                    nine_patch,
-                );
+                let brush_segments = nine_patch.create_segments(rect);
 
                 PrimitiveTemplateKind::ImageBorder {
                     request,
@@ -874,10 +871,7 @@ impl PrimitiveKeyKind {
                 let mut brush_segments = Vec::new();
 
                 if let Some(ref nine_patch) = nine_patch {
-                    brush_segments = create_nine_patch_segments(
-                        rect,
-                        nine_patch,
-                    );
+                    brush_segments = nine_patch.create_segments(rect);
                 }
 
                 // Save opacity of the stops for use in