Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193519 => 193520)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-05 18:30:21 UTC (rev 193520)
@@ -1,5 +1,21 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r188604. rdar://problem/23769584
+
+ 2015-08-18 Simon Fraser <simon.fra...@apple.com>
+
+ will-change: backface-visibility should not cause stacking context
+ https://bugs.webkit.org/show_bug.cgi?id=148091
+
+ Reviewed by Zalan Bujtas.
+
+ Test that will-change: -webkit-backface-visibility does not create
+ stacking context.
+
+ * fast/css/will-change/resources/will-change-stacking-helper.js:
+
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r189890. rdar://problem/23769735
2015-09-16 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js (193519 => 193520)
--- branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js 2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js 2015-12-05 18:30:21 UTC (rev 193520)
@@ -2,6 +2,7 @@
{ 'property' : 'auto', 'stacking' : false },
{ 'property' : 'background', 'stacking' : false },
{ 'property' : 'will-change', 'stacking' : false },
+ { 'property' : '-webkit-backface-visibility', 'stacking' : false },
{ 'property' : 'clip-path', 'stacking' : true },
{ 'property' : 'mask', 'stacking' : true },
@@ -16,7 +17,6 @@
{ 'property' : '-webkit-filter', 'stacking' : true },
{ 'property' : '-webkit-clip-path', 'stacking' : true },
- { 'property' : '-webkit-backface-visibility', 'stacking' : true },
{ 'property' : '-webkit-box-reflect', 'stacking' : true },
{ 'property' : '-webkit-backdrop-filter', 'stacking' : true },
{ 'property' : '-webkit-mask', 'stacking' : true },
Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193519 => 193520)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-05 18:30:21 UTC (rev 193520)
@@ -1,5 +1,32 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r188604. rdar://problem/23769584
+
+ 2015-08-18 Simon Fraser <simon.fra...@apple.com>
+
+ will-change: backface-visibility should not cause stacking context
+ https://bugs.webkit.org/show_bug.cgi?id=148091
+
+ Reviewed by Zalan Bujtas.
+
+ Take CSSPropertyWebkitBackfaceVisibility out of the list of properties that causes
+ will-change to create stacking context, since no value of the property creates
+ stacking.
+
+ Move willChangeCreatesStackingContext() and shouldWillChangeCreateStackingContext()
+ into RenderInline since it's only called from there.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::shouldWillChangeCreateStackingContext): Deleted.
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::willChangeCreatesStackingContext): Deleted.
+ * rendering/RenderInline.h:
+ (WebCore::RenderInline::willChangeCreatesStackingContext):
+ * rendering/style/WillChangeData.cpp:
+ (WebCore::propertyCreatesStackingContext): Deleted.
+
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r188168. rdar://problem/23769732
2015-08-07 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp (193519 => 193520)
--- branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp 2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp 2015-12-05 18:30:21 UTC (rev 193520)
@@ -1446,16 +1446,6 @@
return true;
}
-bool RenderElement::shouldWillChangeCreateStackingContext() const
-{
- ASSERT(style().willChange());
- ASSERT(style().willChange()->canCreateStackingContext());
-
- // On inlines, we only want to trigger RenderLayer creation
- // if will-change contains a property that applies to inlines.
- return is<RenderBox>(this) || (is<RenderInline>(this) && style().willChange()->canCreateStackingContextOnInline());
-}
-
RenderNamedFlowThread* RenderElement::renderNamedFlowThreadWrapper()
{
auto* renderer = this;
Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h (193519 => 193520)
--- branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h 2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h 2015-12-05 18:30:21 UTC (rev 193520)
@@ -164,10 +164,6 @@
bool hasClipOrOverflowClip() const { return hasClip() || hasOverflowClip(); }
bool hasClipPath() const { return style().clipPath(); }
bool hasHiddenBackface() const { return style().backfaceVisibility() == BackfaceVisibilityHidden; }
- bool willChangeCreatesStackingContext() const
- {
- return style().willChange() && style().willChange()->canCreateStackingContext() && shouldWillChangeCreateStackingContext();
- }
// anchorRect() is conceptually similar to absoluteBoundingBoxRect(), but is intended for scrolling to an anchor.
// For inline renderers, this gets the logical top left of the first leaf child and the logical bottom right of the
Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h (193519 => 193520)
--- branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h 2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h 2015-12-05 18:30:21 UTC (rev 193520)
@@ -177,6 +177,11 @@
const LayoutRect& nextLine, const Color);
RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);
+ bool willChangeCreatesStackingContext() const
+ {
+ return style().willChange() && style().willChange()->canCreateStackingContextOnInline();
+ }
+
RenderLineBoxList m_lineBoxes; // All of the line boxes created for this inline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
};
Modified: branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp (193519 => 193520)
--- branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp 2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp 2015-12-05 18:30:21 UTC (rev 193520)
@@ -71,7 +71,6 @@
case CSSPropertyOpacity:
case CSSPropertyPosition:
case CSSPropertyZIndex:
- case CSSPropertyWebkitBackfaceVisibility:
case CSSPropertyWebkitBoxReflect:
#if ENABLE(CSS_COMPOSITING)
case CSSPropertyMixBlendMode:
