Title: [208336] branches/safari-602-branch/Source/WebCore
- Revision
- 208336
- Author
- matthew_han...@apple.com
- Date
- 2016-11-03 11:04:51 -0700 (Thu, 03 Nov 2016)
Log Message
Merge r208319. rdar://problem/29084077
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208335 => 208336)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-03 18:04:48 UTC (rev 208335)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-03 18:04:51 UTC (rev 208336)
@@ -1,5 +1,21 @@
2016-11-03 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208319. rdar://problem/29084077
+
+ 2016-11-02 Simon Fraser <simon.fra...@apple.com>
+
+ 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 <matthew_han...@apple.com>
+
Merge r208314. rdar://problem/29084077
2016-11-02 Simon Fraser <simon.fra...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp (208335 => 208336)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-11-03 18:04:48 UTC (rev 208335)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayer.cpp 2016-11-03 18:04:51 UTC (rev 208336)
@@ -6907,6 +6907,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
