author | Carsten "Tomcat" Book <cbook@mozilla.com> |
Wed, 30 Mar 2016 15:19:37 +0200 | |
changeset 290891 | 9b0efb1e937b20d69d596c778849b0163b4cba45 |
parent 290890 | 2be0bf743c62c9e6a697422f6fce546c9987dfc8 |
child 290892 | d791887510c81cbea2d241054c6494bd4b712efb |
push id | 74413 |
push user | cbook@mozilla.com |
push date | Wed, 30 Mar 2016 13:20:39 +0000 |
treeherder | mozilla-inbound@9b0efb1e937b [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1209273 |
milestone | 48.0a1 |
backs out | 073149564592e1da4dca4a7324a23f3df35422de |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/layout/style/nsCSSKeywordList.h +++ b/layout/style/nsCSSKeywordList.h @@ -243,28 +243,26 @@ CSS_KEY(double-circle, double_circle) CSS_KEY(double-struck, double_struck) CSS_KEY(drag, drag) CSS_KEY(drop-shadow, drop_shadow) CSS_KEY(e-resize, e_resize) CSS_KEY(ease, ease) CSS_KEY(ease-in, ease_in) CSS_KEY(ease-in-out, ease_in_out) CSS_KEY(ease-out, ease_out) -CSS_KEY(economy, economy) CSS_KEY(element, element) CSS_KEY(elements, elements) CSS_KEY(ellipse, ellipse) CSS_KEY(ellipsis, ellipsis) CSS_KEY(em, em) CSS_KEY(embed, embed) CSS_KEY(enabled, enabled) CSS_KEY(end, end) CSS_KEY(ethiopic-numeric, ethiopic_numeric) CSS_KEY(ex, ex) -CSS_KEY(exact, exact) CSS_KEY(exclude, exclude) CSS_KEY(exclusion, exclusion) CSS_KEY(expanded, expanded) CSS_KEY(extends, extends) CSS_KEY(extra-condensed, extra_condensed) CSS_KEY(extra-expanded, extra_expanded) CSS_KEY(ew-resize, ew_resize) CSS_KEY(fallback, fallback)
--- a/layout/style/nsCSSPropList.h +++ b/layout/style/nsCSSPropList.h @@ -1383,26 +1383,16 @@ CSS_PROP_COLOR( CSS_PROPERTY_APPLIES_TO_PLACEHOLDER | CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED | CSS_PROPERTY_HASHLESS_COLOR_QUIRK, "", VARIANT_HC, nullptr, offsetof(nsStyleColor, mColor), eStyleAnimType_Color) -CSS_PROP_VISIBILITY( - color-adjust, - color_adjust, - ColorAdjust, - CSS_PROPERTY_PARSE_VALUE, - "layout.css.color-adjust.enabled", - VARIANT_HK, - kColorAdjustKTable, - CSS_PROP_NO_OFFSET, - eStyleAnimType_None) CSS_PROP_SHORTHAND( -moz-columns, _moz_columns, CSS_PROP_DOMPROP_PREFIXED(Columns), CSS_PROPERTY_PARSE_FUNCTION, "") CSS_PROP_COLUMN( -moz-column-count,
--- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -2361,22 +2361,16 @@ const KTableEntry nsCSSProps::kTextRende }; const KTableEntry nsCSSProps::kVectorEffectKTable[] = { { eCSSKeyword_none, NS_STYLE_VECTOR_EFFECT_NONE }, { eCSSKeyword_non_scaling_stroke, NS_STYLE_VECTOR_EFFECT_NON_SCALING_STROKE }, { eCSSKeyword_UNKNOWN, -1 } }; -const KTableEntry nsCSSProps::kColorAdjustKTable[] = { - { eCSSKeyword_economy, NS_STYLE_COLOR_ADJUST_ECONOMY }, - { eCSSKeyword_exact, NS_STYLE_COLOR_ADJUST_EXACT }, - { eCSSKeyword_UNKNOWN, -1 } -}; - const KTableEntry nsCSSProps::kColorInterpolationKTable[] = { { eCSSKeyword_auto, NS_STYLE_COLOR_INTERPOLATION_AUTO }, { eCSSKeyword_srgb, NS_STYLE_COLOR_INTERPOLATION_SRGB }, { eCSSKeyword_linearrgb, NS_STYLE_COLOR_INTERPOLATION_LINEARRGB }, { eCSSKeyword_UNKNOWN, -1 } }; const KTableEntry nsCSSProps::kColumnFillKTable[] = {
--- a/layout/style/nsCSSProps.h +++ b/layout/style/nsCSSProps.h @@ -702,17 +702,16 @@ public: static const KTableEntry kImageRenderingKTable[]; static const KTableEntry kShapeRenderingKTable[]; static const KTableEntry kStrokeLinecapKTable[]; static const KTableEntry kStrokeLinejoinKTable[]; static const KTableEntry kStrokeContextValueKTable[]; static const KTableEntry kVectorEffectKTable[]; static const KTableEntry kTextAnchorKTable[]; static const KTableEntry kTextRenderingKTable[]; - static const KTableEntry kColorAdjustKTable[]; static const KTableEntry kColorInterpolationKTable[]; static const KTableEntry kColumnFillKTable[]; static const KTableEntry kBoxPropSourceKTable[]; static const KTableEntry kBoxShadowTypeKTable[]; static const KTableEntry kBoxSizingKTable[]; static const KTableEntry kCaptionSideKTable[]; // Not const because we modify its entries when the pref // "layout.css.float-logical-values.enabled" changes:
--- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -975,26 +975,16 @@ already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetColor() { RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue; SetToRGBAColor(val, StyleColor()->mColor); return val.forget(); } already_AddRefed<CSSValue> -nsComputedDOMStyle::DoGetColorAdjust() -{ - RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue; - val->SetIdent( - nsCSSProps::ValueToKeywordEnum(StyleVisibility()->mColorAdjust, - nsCSSProps::kColorAdjustKTable)); - return val.forget(); -} - -already_AddRefed<CSSValue> nsComputedDOMStyle::DoGetOpacity() { RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue; val->SetNumber(StyleDisplay()->mOpacity); return val.forget(); } already_AddRefed<CSSValue>
--- a/layout/style/nsComputedDOMStyle.h +++ b/layout/style/nsComputedDOMStyle.h @@ -423,17 +423,16 @@ private: already_AddRefed<CSSValue> DoGetWordBreak(); already_AddRefed<CSSValue> DoGetWordWrap(); already_AddRefed<CSSValue> DoGetHyphens(); already_AddRefed<CSSValue> DoGetTabSize(); already_AddRefed<CSSValue> DoGetTextSizeAdjust(); already_AddRefed<CSSValue> DoGetWebkitTextFillColor(); /* Visibility properties */ - already_AddRefed<CSSValue> DoGetColorAdjust(); already_AddRefed<CSSValue> DoGetOpacity(); already_AddRefed<CSSValue> DoGetPointerEvents(); already_AddRefed<CSSValue> DoGetVisibility(); already_AddRefed<CSSValue> DoGetWritingMode(); /* Direction properties */ already_AddRefed<CSSValue> DoGetDirection(); already_AddRefed<CSSValue> DoGetUnicodeBidi();
--- a/layout/style/nsComputedDOMStylePropertyList.h +++ b/layout/style/nsComputedDOMStylePropertyList.h @@ -97,17 +97,16 @@ COMPUTED_STYLE_PROP(border_top_width, COMPUTED_STYLE_PROP(bottom, Bottom) COMPUTED_STYLE_PROP(box_decoration_break, BoxDecorationBreak) COMPUTED_STYLE_PROP(box_shadow, BoxShadow) COMPUTED_STYLE_PROP(box_sizing, BoxSizing) COMPUTED_STYLE_PROP(caption_side, CaptionSide) COMPUTED_STYLE_PROP(clear, Clear) COMPUTED_STYLE_PROP(clip, Clip) COMPUTED_STYLE_PROP(color, Color) -COMPUTED_STYLE_PROP(color_adjust, ColorAdjust) COMPUTED_STYLE_PROP(contain, Contain) COMPUTED_STYLE_PROP(content, Content) COMPUTED_STYLE_PROP(counter_increment, CounterIncrement) COMPUTED_STYLE_PROP(counter_reset, CounterReset) COMPUTED_STYLE_PROP(cursor, Cursor) COMPUTED_STYLE_PROP(direction, Direction) COMPUTED_STYLE_PROP(display, Display) COMPUTED_STYLE_PROP(empty_cells, EmptyCells)
--- a/layout/style/nsRuleNode.cpp +++ b/layout/style/nsRuleNode.cpp @@ -6456,22 +6456,16 @@ nsRuleNode::ComputeVisibilityData(void* break; default: NS_NOTREACHED("Invalid image-orientation enumerated value"); } } else { MOZ_ASSERT(orientation->GetUnit() == eCSSUnit_Null, "Should be null unit"); } - SetDiscrete(*aRuleData->ValueForColorAdjust(), visibility->mColorAdjust, - conditions, - SETDSC_ENUMERATED | SETDSC_UNSET_INHERIT, - parentVisibility->mColorAdjust, - NS_STYLE_COLOR_ADJUST_ECONOMY, 0, 0, 0, 0); - COMPUTE_END_INHERITED(Visibility, visibility) } const void* nsRuleNode::ComputeColorData(void* aStartStruct, const nsRuleData* aRuleData, nsStyleContext* aContext, nsRuleNode* aHighestNode,
--- a/layout/style/nsStyleConsts.h +++ b/layout/style/nsStyleConsts.h @@ -1116,20 +1116,16 @@ enum class FillMode : uint32_t; #define NS_STYLE_TEXT_EMPHASIS_STYLE_STRING 255 // text-rendering #define NS_STYLE_TEXT_RENDERING_AUTO 0 #define NS_STYLE_TEXT_RENDERING_OPTIMIZESPEED 1 #define NS_STYLE_TEXT_RENDERING_OPTIMIZELEGIBILITY 2 #define NS_STYLE_TEXT_RENDERING_GEOMETRICPRECISION 3 -// adjust-color -#define NS_STYLE_COLOR_ADJUST_ECONOMY 0 -#define NS_STYLE_COLOR_ADJUST_EXACT 1 - // color-interpolation and color-interpolation-filters #define NS_STYLE_COLOR_INTERPOLATION_AUTO 0 #define NS_STYLE_COLOR_INTERPOLATION_SRGB 1 #define NS_STYLE_COLOR_INTERPOLATION_LINEARRGB 2 // vector-effect #define NS_STYLE_VECTOR_EFFECT_NONE 0 #define NS_STYLE_VECTOR_EFFECT_NON_SCALING_STROKE 1
--- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -3167,29 +3167,27 @@ nsStyleVisibility::nsStyleVisibility(nsP mDirection = NS_STYLE_DIRECTION_RTL; else mDirection = NS_STYLE_DIRECTION_LTR; mVisible = NS_STYLE_VISIBILITY_VISIBLE; mPointerEvents = NS_STYLE_POINTER_EVENTS_AUTO; mWritingMode = NS_STYLE_WRITING_MODE_HORIZONTAL_TB; mTextOrientation = NS_STYLE_TEXT_ORIENTATION_MIXED; - mColorAdjust = NS_STYLE_COLOR_ADJUST_ECONOMY; } nsStyleVisibility::nsStyleVisibility(const nsStyleVisibility& aSource) { MOZ_COUNT_CTOR(nsStyleVisibility); mImageOrientation = aSource.mImageOrientation; mDirection = aSource.mDirection; mVisible = aSource.mVisible; mPointerEvents = aSource.mPointerEvents; mWritingMode = aSource.mWritingMode; mTextOrientation = aSource.mTextOrientation; - mColorAdjust = aSource.mColorAdjust; } nsChangeHint nsStyleVisibility::CalcDifference(const nsStyleVisibility& aOther) const { nsChangeHint hint = nsChangeHint(0); if (mDirection != aOther.mDirection || mWritingMode != aOther.mWritingMode) { // It's important that a change in mWritingMode results in frame @@ -3214,20 +3212,16 @@ nsChangeHint nsStyleVisibility::CalcDiff } if (mPointerEvents != aOther.mPointerEvents) { // nsSVGPathGeometryFrame's mRect depends on stroke _and_ on the value // of pointer-events. See nsSVGPathGeometryFrame::ReflowSVG's use of // GetHitTestFlags. (Only a reflow, no visual change.) NS_UpdateHint(hint, nsChangeHint_NeedReflow); NS_UpdateHint(hint, nsChangeHint_NeedDirtyReflow); // XXX remove me: bug 876085 } - if (mColorAdjust != aOther.mColorAdjust) { - // color-adjust only affects media where dynamic changes can't happen. - NS_UpdateHint(hint, nsChangeHint_NeutralChange); - } } return hint; } nsStyleContentData::~nsStyleContentData() { MOZ_ASSERT(!mImageTracked, "nsStyleContentData being destroyed while still tracking image!");
--- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -2104,34 +2104,32 @@ struct nsStyleVisibility void Destroy(nsPresContext* aContext) { this->~nsStyleVisibility(); aContext->PresShell()-> FreeByObjectID(mozilla::eArenaObjectID_nsStyleVisibility, this); } nsChangeHint CalcDifference(const nsStyleVisibility& aOther) const; static nsChangeHint MaxDifference() { - return NS_STYLE_HINT_FRAMECHANGE | - nsChangeHint_NeutralChange; + return NS_STYLE_HINT_FRAMECHANGE; } static nsChangeHint DifferenceAlwaysHandledForDescendants() { // CalcDifference never returns the reflow hints that are sometimes // handled for descendants as hints not handled for descendants. return nsChangeHint_NeedReflow | nsChangeHint_ReflowChangesSizeOrPosition | nsChangeHint_ClearAncestorIntrinsics; } nsStyleImageOrientation mImageOrientation; // [inherited] uint8_t mDirection; // [inherited] see nsStyleConsts.h NS_STYLE_DIRECTION_* uint8_t mVisible; // [inherited] uint8_t mPointerEvents; // [inherited] see nsStyleConsts.h uint8_t mWritingMode; // [inherited] see nsStyleConsts.h uint8_t mTextOrientation; // [inherited] see nsStyleConsts.h - uint8_t mColorAdjust; // [inherited] see nsStyleConsts.h bool IsVisible() const { return (mVisible == NS_STYLE_VISIBILITY_VISIBLE); } bool IsVisibleOrCollapsed() const { return ((mVisible == NS_STYLE_VISIBILITY_VISIBLE) || (mVisible == NS_STYLE_VISIBILITY_COLLAPSE));
--- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -1363,24 +1363,16 @@ var gCSSProperties = { }, "-moz-box-sizing": { domProp: "MozBoxSizing", inherited: false, type: CSS_TYPE_SHORTHAND_AND_LONGHAND, alias_for: "box-sizing", subproperties: [ "box-sizing" ], }, - "color-adjust": { - domProp: "colorAdjust", - inherited: true, - type: CSS_TYPE_LONGHAND, - initial_values: [ "economy" ], - other_values: [ "exact" ], - invalid_values: [] - }, "-moz-columns": { domProp: "MozColumns", inherited: false, type: CSS_TYPE_TRUE_SHORTHAND, subproperties: [ "-moz-column-count", "-moz-column-width" ], initial_values: [ "auto", "auto auto" ], other_values: [ "3", "20px", "2 10px", "10px 2", "2 auto", "auto 2", "auto 50px", "50px auto" ], invalid_values: [ "5%", "-1px", "-1", "3 5", "10px 4px", "10 2px 5in", "30px -1",
--- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5259,12 +5259,10 @@ pref("toolkit.pageThumbs.minHeight", 0); pref("webextensions.tests", false); // Allow customization of the fallback directory for file uploads pref("dom.input.fallbackUploadDir", ""); // Turn rewriting of youtube embeds on/off pref("plugins.rewrite_youtube_embeds", true); -// Is support for 'color-adjust' CSS property enabled? -pref("layout.css.color-adjust.enabled", true); // Disable browser frames by default pref("dom.mozBrowserFramesEnabled", false);