Bug 1409736 - Initialize the new clip member introduced in WR PR 1867. r?Gankro draft
authorKartikaya Gupta <kgupta@mozilla.com>
Mon, 23 Oct 2017 09:48:45 -0400
changeset 684721 8152b8323e1cd57e18dcc194eb1fbd186f9fd124
parent 684720 695660257c2d0806d7d9b3483b2c51bb3d5c422c
child 684722 5214052ea9d52fdb4a0994f91f051ca36c8728bc
push id85704
push userkgupta@mozilla.com
push dateMon, 23 Oct 2017 13:50:55 +0000
reviewersGankro
bugs1409736
milestone58.0a1
Bug 1409736 - Initialize the new clip member introduced in WR PR 1867. r?Gankro MozReview-Commit-ID: JRzYT4WNoJi
gfx/webrender_bindings/WebRenderTypes.h
layout/painting/DisplayItemClip.cpp
--- a/gfx/webrender_bindings/WebRenderTypes.h
+++ b/gfx/webrender_bindings/WebRenderTypes.h
@@ -320,16 +320,17 @@ static inline wr::LayoutSize ToLayoutSiz
 static inline wr::ComplexClipRegion ToComplexClipRegion(const RoundedRect& rect)
 {
   wr::ComplexClipRegion ret;
   ret.rect               = ToLayoutRect(rect.rect);
   ret.radii.top_left     = ToLayoutSize(LayoutDeviceSize::FromUnknownSize(rect.corners.radii[mozilla::eCornerTopLeft]));
   ret.radii.top_right    = ToLayoutSize(LayoutDeviceSize::FromUnknownSize(rect.corners.radii[mozilla::eCornerTopRight]));
   ret.radii.bottom_left  = ToLayoutSize(LayoutDeviceSize::FromUnknownSize(rect.corners.radii[mozilla::eCornerBottomLeft]));
   ret.radii.bottom_right = ToLayoutSize(LayoutDeviceSize::FromUnknownSize(rect.corners.radii[mozilla::eCornerBottomRight]));
+  ret.mode = wr::ClipMode::Clip;
   return ret;
 }
 
 static inline wr::LayoutSize ToLayoutSize(const mozilla::LayoutDeviceIntSize& size)
 {
   return ToLayoutSize(LayoutDeviceSize(size));
 }
 
--- a/layout/painting/DisplayItemClip.cpp
+++ b/layout/painting/DisplayItemClip.cpp
@@ -485,12 +485,13 @@ DisplayItemClip::ToComplexClipRegions(in
     region->rect = aSc.ToRelativeLayoutRect(LayoutDeviceRect::FromAppUnits(
         mRoundedClipRects[i].mRect, aAppUnitsPerDevPixel));
     const nscoord* radii = mRoundedClipRects[i].mRadii;
     region->radii = wr::ToBorderRadius(
         LayoutDeviceSize::FromAppUnits(nsSize(radii[eCornerTopLeftX], radii[eCornerTopLeftY]), aAppUnitsPerDevPixel),
         LayoutDeviceSize::FromAppUnits(nsSize(radii[eCornerTopRightX], radii[eCornerTopRightY]), aAppUnitsPerDevPixel),
         LayoutDeviceSize::FromAppUnits(nsSize(radii[eCornerBottomLeftX], radii[eCornerBottomLeftY]), aAppUnitsPerDevPixel),
         LayoutDeviceSize::FromAppUnits(nsSize(radii[eCornerBottomRightX], radii[eCornerBottomRightY]), aAppUnitsPerDevPixel));
+    region->mode = wr::ClipMode::Clip;
   }
 }
 
 } // namespace mozilla