Bug 1063162 part 2 - Implement caret-color property. r=dholbert

MozReview-Commit-ID: DH7CX1d477R --HG-- extra : rebase_source : 29c57f59a3073a05beed1c4160e2fd74d3e29617
2016-12-22 11:04:15 +11:00 · 2016-12-22 11:04:15 +11:00 · 262d2eb93a
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@ -2857,6 +2857,7 @@ exports.CSS_PROPERTIES = {
      "box-shadow",
      "box-sizing",
      "caption-side",
+      "caret-color",
      "clear",
      "clip",
      "clip-path",
@ -5261,6 +5262,28 @@ exports.CSS_PROPERTIES = {
      "unset"
    ]
  },
+  "caret-color": {
+    "isInherited": true,
+    "subproperties": [
+      "caret-color"
+    ],
+    "supports": [
+      2
+    ],
+    "values": [
+      "COLOR",
+      "auto",
+      "currentColor",
+      "hsl",
+      "hsla",
+      "inherit",
+      "initial",
+      "rgb",
+      "rgba",
+      "transparent",
+      "unset"
+    ]
+  },
  "clear": {
    "isInherited": false,
    "subproperties": [
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@ -1882,8 +1882,7 @@ nsIFrame::DisplayCaret(nsDisplayListBuilder* aBuilder,
 nscolor
 nsIFrame::GetCaretColorAt(int32_t aOffset)
 {
-  // Use text color.
-  return StyleColor()->mColor;
+  return StyleColor()->CalcComplexColor(StyleUserInterface()->mCaretColor);
 }

 bool
--- a/layout/reftests/css-ui/caret-color-01-ref.html
+++ b/layout/reftests/css-ui/caret-color-01-ref.html
@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<style>
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+div {
+  font: 16px/1 Ahem;
+  width: 1em;
+  background: green;
+}
+</style>
+<div><span></span></div>
+<script>
+let $div = document.querySelector('div');
+let $span = document.querySelector('span');
+$div.style.height = $span.getBoundingClientRect().height + 'px';
+</script>
--- a/layout/reftests/css-ui/caret-color-01.html
+++ b/layout/reftests/css-ui/caret-color-01.html
@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<style>
+@font-face {
+  font-family: Ahem;
+  src: url(../fonts/Ahem.ttf);
+}
+textarea {
+  caret-color: green;
+  font: 16px/1 Ahem;
+  outline: none;
+  border: 0 none;
+  resize: none;
+  padding: 0;
+  margin: 0;
+}
+</style>
+<textarea autofocus></textarea>
--- a/layout/reftests/css-ui/reftest.list
+++ b/layout/reftests/css-ui/reftest.list
@ -0,0 +1 @@
+pref(ui.caretWidth,16) needs-focus == caret-color-01.html caret-color-01-ref.html
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@ -130,6 +130,9 @@ include css-sizing/reftest.list
 # css transitions
 include css-transitions/reftest.list

+# css ui
+include css-ui/reftest.list
+
 # css :-moz-ui-invalid
 include css-ui-invalid/reftest.list

--- a/layout/style/nsCSSPropList.h
+++ b/layout/style/nsCSSPropList.h
@ -1381,6 +1381,17 @@ CSS_PROP_TABLEBORDER(
    kCaptionSideKTable,
    CSS_PROP_NO_OFFSET,
    eStyleAnimType_Discrete)
+CSS_PROP_USERINTERFACE(
+    caret-color,
+    caret_color,
+    CaretColor,
+    CSS_PROPERTY_PARSE_VALUE |
+        CSS_PROPERTY_IGNORED_WHEN_COLORS_DISABLED,
+    "",
+    VARIANT_AUTO | VARIANT_HC,
+    nullptr,
+    offsetof(nsStyleUserInterface, mCaretColor),
+    eStyleAnimType_ComplexColor)
 CSS_PROP_DISPLAY(
    clear,
    clear,
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@ -4143,6 +4143,14 @@ nsComputedDOMStyle::DoGetUnicodeBidi()
  return val.forget();
 }

+already_AddRefed<CSSValue>
+nsComputedDOMStyle::DoGetCaretColor()
+{
+  RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
+  SetValueFromComplexColor(val, StyleUserInterface()->mCaretColor);
+  return val.forget();
+}
+
 already_AddRefed<CSSValue>
 nsComputedDOMStyle::DoGetCursor()
 {
--- a/layout/style/nsComputedDOMStyle.h
+++ b/layout/style/nsComputedDOMStyle.h
@ -482,6 +482,7 @@ private:
  already_AddRefed<CSSValue> DoGetShapeOutside();

  /* User interface properties */
+  already_AddRefed<CSSValue> DoGetCaretColor();
  already_AddRefed<CSSValue> DoGetCursor();
  already_AddRefed<CSSValue> DoGetForceBrokenImageIcon();
  already_AddRefed<CSSValue> DoGetIMEMode();
--- a/layout/style/nsComputedDOMStylePropertyList.h
+++ b/layout/style/nsComputedDOMStylePropertyList.h
@ -101,6 +101,7 @@ 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(caret_color,                   CaretColor)
 COMPUTED_STYLE_PROP(clear,                         Clear)
 COMPUTED_STYLE_PROP(clip,                          Clip)
 COMPUTED_STYLE_PROP(color,                         Color)
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@ -1142,6 +1142,8 @@ SetComplexColor(const nsCSSValue& aValue,
    aResult = StyleComplexColor::CurrentColor();
  } else if (unit == eCSSUnit_ComplexColor) {
    aResult = aValue.GetStyleComplexColorValue();
+  } else if (unit == eCSSUnit_Auto) {
+    aResult = StyleComplexColor::Auto();
  } else {
    nscolor resultColor;
    if (!SetColor(aValue, aParentColor.mColor, aPresContext,
@ -5294,6 +5296,14 @@ nsRuleNode::ComputeUserInterfaceData(void* aStartStruct,
           parentUI->mPointerEvents,
           NS_STYLE_POINTER_EVENTS_AUTO);

+  // caret-color: auto, color, inherit
+  const nsCSSValue* caretColorValue = aRuleData->ValueForCaretColor();
+  SetComplexColor<eUnsetInherit>(*caretColorValue,
+                                 parentUI->mCaretColor,
+                                 StyleComplexColor::Auto(),
+                                 mPresContext,
+                                 ui->mCaretColor, conditions);
+
  COMPUTE_END_INHERITED(UserInterface, ui)
 }

--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@ -3974,6 +3974,7 @@ nsStyleUserInterface::nsStyleUserInterface(StyleStructContext aContext)
  , mUserFocus(StyleUserFocus::None)
  , mPointerEvents(NS_STYLE_POINTER_EVENTS_AUTO)
  , mCursor(NS_STYLE_CURSOR_AUTO)
+  , mCaretColor(StyleComplexColor::Auto())
 {
  MOZ_COUNT_CTOR(nsStyleUserInterface);
 }
@ -3985,6 +3986,7 @@ nsStyleUserInterface::nsStyleUserInterface(const nsStyleUserInterface& aSource)
  , mPointerEvents(aSource.mPointerEvents)
  , mCursor(aSource.mCursor)
  , mCursorImages(aSource.mCursorImages)
+  , mCaretColor(aSource.mCaretColor)
 {
  MOZ_COUNT_CTOR(nsStyleUserInterface);
 }
@ -4046,6 +4048,10 @@ nsStyleUserInterface::CalcDifference(const nsStyleUserInterface& aNewData) const
    hint |= nsChangeHint_NeutralChange;
  }

+  if (mCaretColor != aNewData.mCaretColor) {
+    hint |= nsChangeHint_RepaintFrame;
+  }
+
  return hint;
 }

--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@ -3400,6 +3400,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleUserInterface

  uint8_t mCursor;                            // [inherited] See nsStyleConsts.h
  nsTArray<nsCursorImage> mCursorImages;      // [inherited] images and coords
+  mozilla::StyleComplexColor mCaretColor;     // [inherited]

  inline uint8_t GetEffectivePointerEvents(nsIFrame* aFrame) const;
 };
--- a/layout/style/test/property_database.js
+++ b/layout/style/test/property_database.js
@ -2836,6 +2836,18 @@ var gCSSProperties = {
    other_values: [ "bottom", "left", "right", "top-outside", "bottom-outside" ],
    invalid_values: []
  },
+  "caret-color": {
+    domProp: "caretColor",
+    inherited: true,
+    type: CSS_TYPE_LONGHAND,
+    prerequisites: { "color": "black" },
+    // Though "auto" is an independent computed-value time keyword value,
+    // it is not distinguishable from currentcolor because getComputedStyle
+    // always returns used value for <color>.
+    initial_values: [ "auto", "currentcolor", "black", "rgb(0,0,0)" ],
+    other_values: [ "green", "transparent", "rgba(128,128,128,.5)", "#123" ],
+    invalid_values: [ "#0", "#00", "#00000", "cc00ff" ]
+  },
  "clear": {
    domProp: "clear",
    inherited: false,
--- a/layout/style/test/test_transitions_per_property.html
+++ b/layout/style/test/test_transitions_per_property.html
@ -129,6 +129,9 @@ var supported_properties = {
    "bottom": [ test_length_transition, test_percent_transition,
                test_length_percent_calc_transition,
                test_length_unclamped, test_percent_unclamped ],
+    "caret-color": [ test_color_transition,
+                     test_true_currentcolor_transition,
+                     test_auto_color_transition ],
    "clip": [ test_rect_transition ],
    "clip-path": [ test_clip_path_transition ],
    "color": [ test_color_transition,
--- a/layout/tools/reftest/reftest-preferences.js
+++ b/layout/tools/reftest/reftest-preferences.js
@ -8,6 +8,7 @@ user_pref("gfx.color_management.force_srgb", true);
 user_pref("gfx.logging.level", 1);
 user_pref("browser.dom.window.dump.enabled", true);
 user_pref("ui.caretBlinkTime", -1);
+user_pref("ui.caretWidth", 1);
 user_pref("dom.send_after_paint_to_content", true);
 // no slow script dialogs
 user_pref("dom.max_script_run_time", 0);
				`@ -0,0 +1 @@`
				`pref(ui.caretWidth,16) needs-focus == caret-color-01.html caret-color-01-ref.html`