wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changesets 3012ee3c0083 and a5108055f652 (bug 1077872) for reftest asserts.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen 2014-10-16 11:50:37 -04:00
parent 6f68c80511
commit 2437b2f861
18 changed files with 1 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
layout/generic/nsFrame.cpp
View File

@ -2313,7 +2313,6 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
(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)) ||

15
layout/reftests/css-blending/blend-isolation-ref.html
View File

@ -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>

28
layout/reftests/css-blending/blend-isolation.html
View File

@ -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>

3
layout/reftests/css-blending/reftest.list
View File

@ -84,6 +84,3 @@ pref(layout.css.background-blend-mode.enabled,true) == background-blend-mode-bod
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

1
layout/style/nsCSSKeywordList.h
View File

@ -311,7 +311,6 @@ CSS_KEY(inline-table, inline_table)
CSS_KEY(inset, inset)
CSS_KEY(inside, inside)
CSS_KEY(interpolatematrix, interpolatematrix)
CSS_KEY(isolate, isolate)
CSS_KEY(invert, invert)
CSS_KEY(italic, italic)
CSS_KEY(japanese-formal, japanese_formal)

11
layout/style/nsCSSPropList.h
View File

@ -2521,17 +2521,6 @@ CSS_PROP_DISPLAY(
kBlendModeKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_DISPLAY(
isolation,
isolation,
Isolation,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_CREATES_STACKING_CONTEXT,
"layout.css.isolation.enabled",
VARIANT_HK,
kIsolationKTable,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_POSITION(
object-fit,
object_fit,

6
layout/style/nsCSSProps.cpp
View File

@ -1347,12 +1347,6 @@ const KTableValue nsCSSProps::kImageOrientationFlipKTable[] = {
eCSSKeyword_UNKNOWN,-1
};
const KTableValue nsCSSProps::kIsolationKTable[] = {
eCSSKeyword_auto, NS_STYLE_ISOLATION_AUTO,
eCSSKeyword_isolate, NS_STYLE_ISOLATION_ISOLATE,
eCSSKeyword_UNKNOWN,-1
};
const KTableValue nsCSSProps::kIMEModeKTable[] = {
eCSSKeyword_normal, NS_STYLE_IME_MODE_NORMAL,
eCSSKeyword_auto, NS_STYLE_IME_MODE_AUTO,

1
layout/style/nsCSSProps.h
View File

@ -594,7 +594,6 @@ public:
static const KTableValue kGridTrackBreadthKTable[];
static const KTableValue kImageOrientationKTable[];
static const KTableValue kImageOrientationFlipKTable[];
static const KTableValue kIsolationKTable[];
static const KTableValue kIMEModeKTable[];
static const KTableValue kLineHeightKTable[];
static const KTableValue kListStylePositionKTable[];

9
layout/style/nsComputedDOMStyle.cpp
View File

@ -4228,15 +4228,6 @@ nsComputedDOMStyle::DoGetMixBlendMode()
return val;
}
CSSValue*
nsComputedDOMStyle::DoGetIsolation()
{
nsROCSSPrimitiveValue* val = new nsROCSSPrimitiveValue;
val->SetIdent(nsCSSProps::ValueToKeywordEnum(StyleDisplay()->mIsolation,
nsCSSProps::kIsolationKTable));
return val;
}
CSSValue*
nsComputedDOMStyle::DoGetObjectFit()
{

1
layout/style/nsComputedDOMStyle.h
View File

@ -235,7 +235,6 @@ private:
mozilla::dom::CSSValue* DoGetMinHeight();
mozilla::dom::CSSValue* DoGetMinWidth();
mozilla::dom::CSSValue* DoGetMixBlendMode();
mozilla::dom::CSSValue* DoGetIsolation();
mozilla::dom::CSSValue* DoGetObjectFit();
mozilla::dom::CSSValue* DoGetObjectPosition();
mozilla::dom::CSSValue* DoGetLeft();

1
layout/style/nsComputedDOMStylePropertyList.h
View File

@ -146,7 +146,6 @@ COMPUTED_STYLE_PROP(grid_template_rows, GridTemplateRows)
COMPUTED_STYLE_PROP(height, Height)
COMPUTED_STYLE_PROP(image_orientation, ImageOrientation)
COMPUTED_STYLE_PROP(ime_mode, IMEMode)
COMPUTED_STYLE_PROP(isolation, Isolation)
COMPUTED_STYLE_PROP(justify_content, JustifyContent)
COMPUTED_STYLE_PROP(left, Left)
COMPUTED_STYLE_PROP(letter_spacing, LetterSpacing)

7
layout/style/nsRuleNode.cpp
View File

@ -5297,13 +5297,6 @@ nsRuleNode::ComputeDisplayData(void* aStartStruct,
parentDisplay->mMixBlendMode, NS_STYLE_BLEND_NORMAL,
0, 0, 0, 0);
// isolation: enum, inherit, initial
SetDiscrete(*aRuleData->ValueForIsolation(), display->mIsolation,
canStoreInRuleTree,
SETDSC_ENUMERATED | SETDSC_UNSET_INITIAL,
parentDisplay->mIsolation, NS_STYLE_ISOLATION_AUTO,
0, 0, 0, 0);
// Backup original display value for calculation of a hypothetical
// box (CSS2 10.6.4/10.6.5), in addition to getting our style data right later.
// See nsHTMLReflowState::CalculateHypotheticalBox

4
layout/style/nsStyleConsts.h
View File

@ -720,10 +720,6 @@ static inline mozilla::css::Side operator++(mozilla::css::Side& side, int) {
#define NS_STYLE_IMAGE_ORIENTATION_FLIP 0
#define NS_STYLE_IMAGE_ORIENTATION_FROM_IMAGE 1
// See nsStyleDisplay
#define NS_STYLE_ISOLATION_AUTO 0
#define NS_STYLE_ISOLATION_ISOLATE 1
// See nsStylePosition.mObjectFit
#define NS_STYLE_OBJECT_FIT_FILL 0
#define NS_STYLE_OBJECT_FIT_CONTAIN 1

5
layout/style/nsStyleStruct.cpp
View File

@ -2582,7 +2582,6 @@ nsStyleDisplay::nsStyleDisplay()
mTransformStyle = NS_STYLE_TRANSFORM_STYLE_FLAT;
mOrient = NS_STYLE_ORIENT_AUTO;
mMixBlendMode = NS_STYLE_BLEND_NORMAL;
mIsolation = NS_STYLE_ISOLATION_AUTO;
mTouchAction = NS_STYLE_TOUCH_ACTION_AUTO;
mTransitions.AppendElement();
@ -2629,7 +2628,6 @@ nsStyleDisplay::nsStyleDisplay(const nsStyleDisplay& aSource)
, mClipFlags(aSource.mClipFlags)
, mOrient(aSource.mOrient)
, mMixBlendMode(aSource.mMixBlendMode)
, mIsolation(aSource.mIsolation)
, mWillChangeBitField(aSource.mWillChangeBitField)
, mWillChange(aSource.mWillChange)
, mTouchAction(aSource.mTouchAction)
@ -2728,8 +2726,7 @@ nsChangeHint nsStyleDisplay::CalcDifference(const nsStyleDisplay& aOther) const
}
}
if (mMixBlendMode != aOther.mMixBlendMode
|| mIsolation != aOther.mIsolation) {
if (mMixBlendMode != aOther.mMixBlendMode) {
NS_UpdateHint(hint, nsChangeHint_RepaintFrame);
}

1
layout/style/nsStyleStruct.h
View File

@ -2023,7 +2023,6 @@ struct nsStyleDisplay {
uint8_t mClipFlags; // [reset] see nsStyleConsts.h
uint8_t mOrient; // [reset] see nsStyleConsts.h
uint8_t mMixBlendMode; // [reset] see nsStyleConsts.h
uint8_t mIsolation; // [reset] see nsStyleConsts.h
uint8_t mWillChangeBitField; // [reset] see nsStyleConsts.h. Stores a
// bitfield representation of the properties
// that are frequently queried. This should

11
layout/style/test/property_database.js
View File

@ -5514,17 +5514,6 @@ if (SpecialPowers.getBoolPref("layout.css.mix-blend-mode.enabled")) {
};
}
if (SpecialPowers.getBoolPref("layout.css.isolation.enabled")) {
gCSSProperties["isolation"] = {
domProp: "isolation",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "auto" ],
other_values: ["isolated"],
invalid_values: []
};
}
if (SpecialPowers.getBoolPref("layout.css.background-blend-mode.enabled")) {
gCSSProperties["background-blend-mode"] = {
domProp: "backgroundBlendMode",

1
layout/style/test/test_computed_style_prefs.html
View File

@ -71,7 +71,6 @@ var gProps = {
"layout.css.vertical-text.enabled": ["text-combine-upright", "text-orientation", "writing-mode"],
"layout.css.image-orientation.enabled": ["image-orientation"],
"layout.css.mix-blend-mode.enabled": ["mix-blend-mode"],
"layout.css.isolation.enabled": [ "isolation"],
"layout.css.masking.enabled": ["mask-type"],
"layout.css.touch_action.enabled": ["touch-action"]
};

3
modules/libpref/init/all.js
View File

@ -2018,9 +2018,6 @@ pref("layout.css.masking.enabled", true);
// Is support for mix-blend-mode enabled?
pref("layout.css.mix-blend-mode.enabled", true);
// Is support for isolation enabled?
pref("layout.css.isolation.enabled", false);
// Is support for CSS Filters enabled?
pref("layout.css.filters.enabled", true);