Title: [208346] tags/Safari-603.1.11/Source/WebCore
- Revision
- 208346
- Author
- [email protected]
- Date
- 2016-11-03 14:07:35 -0700 (Thu, 03 Nov 2016)
Log Message
Merge r208319. rdar://problem/29053414
Modified Paths
Diff
Modified: tags/Safari-603.1.11/Source/WebCore/ChangeLog (208345 => 208346)
--- tags/Safari-603.1.11/Source/WebCore/ChangeLog 2016-11-03 21:07:32 UTC (rev 208345)
+++ tags/Safari-603.1.11/Source/WebCore/ChangeLog 2016-11-03 21:07:35 UTC (rev 208346)
@@ -1,5 +1,21 @@
2016-11-03 Matthew Hanson <[email protected]>
+ Merge r208319. rdar://problem/29053414
+
+ 2016-11-02 Simon Fraser <[email protected]>
+
+ Followup after r208314.
+
+ The style created for reflections contains transforms and a mask, so needs to get explicit
+ z-index on it. This doesn't change rendering, since this layer has no children.
+
+ Fixes assertions in various reflection tests.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+
+2016-11-03 Matthew Hanson <[email protected]>
+
Merge r208314. rdar://problem/29053414
2016-11-02 Simon Fraser <[email protected]>
Modified: tags/Safari-603.1.11/Source/WebCore/rendering/RenderLayer.cpp (208345 => 208346)
--- tags/Safari-603.1.11/Source/WebCore/rendering/RenderLayer.cpp 2016-11-03 21:07:32 UTC (rev 208345)
+++ tags/Safari-603.1.11/Source/WebCore/rendering/RenderLayer.cpp 2016-11-03 21:07:35 UTC (rev 208346)
@@ -6925,6 +6925,9 @@
// Map in our mask.
newStyle.setMaskBoxImage(renderer().style().boxReflect()->mask());
+
+ // Style has transform and mask, so needs to be stacking context.
+ newStyle.setZIndex(0);
return newStyle;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes