Backed out changeset e457165df2a3 (bug 1077872) for bustage
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 15 Oct 2014 10:40:02 +0200
changeset 210520 ba5d8bf0d6496c9a691171567ff1e0c7407e9635
parent 210519 43ca41b136f3d6a344b635f0c8fd6c6f53a5dc4a
child 210521 7d5bc73600d2df25fa1ca5a2a6262988e06d0c3b
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1077872
milestone36.0a1
backs oute457165df2a3355453be2f9a0f06d485efdce821
Backed out changeset e457165df2a3 (bug 1077872) for bustage
layout/generic/nsFrame.cpp
layout/reftests/css-blending/blend-isolation-ref.html
layout/reftests/css-blending/blend-isolation.html
layout/reftests/css-blending/reftest.list
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -2308,17 +2308,16 @@ nsIFrame::BuildDisplayListForChild(nsDis
     || disp->mMixBlendMode != NS_STYLE_BLEND_NORMAL
     || nsSVGIntegrationUtils::UsingEffectsForFrame(child);
 
   bool isPositioned = disp->IsPositioned(child);
   bool isStackingContext =
     (isPositioned && (disp->mPosition == NS_STYLE_POSITION_STICKY ||
                       pos->mZIndex.GetUnit() == eStyleUnit_Integer)) ||
      (disp->mWillChangeBitField & NS_STYLE_WILL_CHANGE_STACKING_CONTEXT) ||
-     disp->mIsolation != NS_STYLE_ISOLATION_AUTO ||
      isVisuallyAtomic || (aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT);
 
   if (isVisuallyAtomic || isPositioned || (!isSVG && disp->IsFloating(child)) ||
       ((disp->mClipFlags & NS_STYLE_CLIP_RECT) &&
        IsSVGContentWithCSSClip(child)) ||
        (disp->mWillChangeBitField & NS_STYLE_WILL_CHANGE_STACKING_CONTEXT) ||
       (aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
     // If you change this, also change IsPseudoStackingContextFromStyle()
deleted file mode 100644
--- a/layout/reftests/css-blending/blend-isolation-ref.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<style>
-#a {
-  background-color: rgb(0,255,0);
-  width: 200px;
-  height: 210px;
-}
-</style>
-<div id="a">
-</div>
-</html>
deleted file mode 100644
--- a/layout/reftests/css-blending/blend-isolation.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-<style>
-.a {
-  background-color: rgb(0,255,0);
-}
-#b {
-  width: 200px;
-  height: 210px;
-}
-.c {
-  width: 100px;
-  height: 100px;
-  mix-blend-mode: difference;
-}
-#d {
-  isolation: isolate;
-}
-</style>
-<div id="b" class="a">
-  <div id="d">
-    <div class="a c"></div>
-  </div>
-</div>
-</html>
--- a/layout/reftests/css-blending/reftest.list
+++ b/layout/reftests/css-blending/reftest.list
@@ -79,11 +79,8 @@ pref(layout.css.background-blend-mode.en
 # Test plan 5.3.11 background-blend-mode for an element with background-attachement
 pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-attachement-fixed.html background-blending-background-attachement-fixed-ref.html
 pref(layout.css.background-blend-mode.enabled,true) == background-blending-background-attachement-fixed-scroll.html background-blending-background-attachement-fixed-scroll-ref.html
 
 pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-body-image.html background-blend-mode-body-image-ref.html
 pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-body-transparent-image.html background-blend-mode-body-transparent-image-ref.html
 
 pref(layout.css.background-blend-mode.enabled,true) == background-blending-moz-element.html background-blending-moz-element-ref.html
-
-# Test plan 4.4.2 element with isolation:isolate creates an isolated group for blended children
-pref(layout.css.isolation.enabled,true) == blend-isolation.html blend-isolation-ref.html