Back out 2 changesets (bug 1209273) for devtools failures in browser_css_autocompletion.js

Backed out changeset 85f7dbb76c15 (bug 1209273)
Backed out changeset 1901109091be (bug 1209273)

layout/base/nsCSSRendering.cpp

@@ -1985,10 +1985,7 @@ nsCSSRendering::DetermineBackgroundColor(nsPresContext* aPresContext,
   aDrawBackgroundImage = true;
   aDrawBackgroundColor = true;
 
-  const nsStyleVisibility* visibility = aStyleContext->StyleVisibility();
-
-  if (visibility->mColorAdjust != NS_STYLE_COLOR_ADJUST_EXACT &&
-      aFrame->HonorPrintBackgroundSettings()) {
+  if (aFrame->HonorPrintBackgroundSettings()) {
     aDrawBackgroundImage = aPresContext->GetBackgroundImageDraw();
     aDrawBackgroundColor = aPresContext->GetBackgroundColorDraw();
   }

layout/style/nsCSSKeywordList.h

@@ -247,7 +247,6 @@ 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)
@@ -258,7 +257,6 @@ 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)

layout/style/nsCSSPropList.h

@@ -1388,16 +1388,6 @@ CSS_PROP_COLOR(
     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,

layout/style/nsCSSProps.cpp

@@ -2364,12 +2364,6 @@ const KTableEntry nsCSSProps::kVectorEffectKTable[] = {
   { 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 },

layout/style/nsCSSProps.h

@@ -707,7 +707,6 @@ public:
   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[];

layout/style/nsComputedDOMStyle.cpp

@@ -979,16 +979,6 @@ nsComputedDOMStyle::DoGetColor()
   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()
 {

layout/style/nsComputedDOMStyle.h

@@ -427,7 +427,6 @@ private:
   already_AddRefed<CSSValue> DoGetTextSizeAdjust();
 
   /* Visibility properties */
-  already_AddRefed<CSSValue> DoGetColorAdjust();
   already_AddRefed<CSSValue> DoGetOpacity();
   already_AddRefed<CSSValue> DoGetPointerEvents();
   already_AddRefed<CSSValue> DoGetVisibility();

layout/style/nsComputedDOMStylePropertyList.h

@@ -102,7 +102,6 @@ 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)

layout/style/nsRuleNode.cpp

@@ -6351,12 +6351,6 @@ nsRuleNode::ComputeVisibilityData(void* aStartStruct,
     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)
 }
 

layout/style/nsStyleConsts.h

@@ -1119,10 +1119,6 @@ enum class FillMode : uint32_t;
 #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

layout/style/nsStyleStruct.cpp

@@ -3172,7 +3172,6 @@ nsStyleVisibility::nsStyleVisibility(nsPresContext* aPresContext)
   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)
@@ -3184,7 +3183,6 @@ nsStyleVisibility::nsStyleVisibility(const nsStyleVisibility& aSource)
   mPointerEvents = aSource.mPointerEvents;
   mWritingMode = aSource.mWritingMode;
   mTextOrientation = aSource.mTextOrientation;
-  mColorAdjust = aSource.mColorAdjust;
 } 
 
 nsChangeHint nsStyleVisibility::CalcDifference(const nsStyleVisibility& aOther) const
@@ -3219,10 +3217,6 @@ nsChangeHint nsStyleVisibility::CalcDifference(const nsStyleVisibility& aOther)
       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;
 }

layout/style/nsStyleStruct.h

@@ -2056,8 +2056,7 @@ struct nsStyleVisibility
 
   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
@@ -2073,7 +2072,6 @@ struct nsStyleVisibility
   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);

layout/style/test/property_database.js

@@ -1368,14 +1368,6 @@ var gCSSProperties = {
     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,

modules/libpref/init/all.js

@@ -5235,7 +5235,5 @@ 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);