Store border-image-* on SurroundData in ComputedStyle

third_party/WebKit/Source/core/style/ComputedStyle.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 97 matching lines @@
   if (!group->base->variable.WidthEquals(value))              \
   group.Access()->base.Access()->variable.SetWidth(value)
 
 namespace blink {
 
 using std::max;
 
 class FilterOperations;
 
 class AppliedTextDecoration;
-class BorderData;
 struct BorderEdge;
 class CSSAnimationData;
 class CSSTransitionData;
 class CSSVariableData;
 class Font;
 class Hyphenation;
 class RotateTransformOperation;
 class ScaleTransformOperation;
 class ShadowList;
 class ShapeValue;
@@ skipping 342 matching lines @@
   bool HasEntirelyFixedBackground() const;
 
   // background-clip
   EFillBox BackgroundClip() const {
     return static_cast<EFillBox>(BackgroundInternal().Clip());
   }
 
   // Border properties.
   // -webkit-border-image
   static NinePieceImage InitialNinePieceImage() { return NinePieceImage(); }
-  const NinePieceImage& BorderImage() const {
-    return surround_data_->border_.GetImage();
-  }
-  void SetBorderImage(const NinePieceImage& b) {
-    SET_VAR(surround_data_, border_.image_, b);
-  }
+  const NinePieceImage& BorderImage() const { return BorderImageInternal(); }
+  void SetBorderImage(const NinePieceImage& b) { SetBorderImageInternal(b); }

[shend, 2017/05/18 05:40:33]

In a future patch, could BorderImage actually be a 'external' field? We would be
able to delete these three functions if so.

[nainar, 2017/05/18 06:00:50]

Got it.

 
   // border-image-slice
   const LengthBox& BorderImageSlices() const {
-    return surround_data_->border_.GetImage().ImageSlices();
+    return BorderImage().ImageSlices();
   }
   void SetBorderImageSlices(const LengthBox&);
 
   // border-image-source
   static StyleImage* InitialBorderImageSource() { return 0; }
-  StyleImage* BorderImageSource() const {
-    return surround_data_->border_.GetImage().GetImage();
-  }
+  StyleImage* BorderImageSource() const { return BorderImage().GetImage(); }
   void SetBorderImageSource(StyleImage*);
 
   // border-image-width
   const BorderImageLengthBox& BorderImageWidth() const {
-    return surround_data_->border_.GetImage().BorderSlices();
+    return BorderImage().BorderSlices();
   }
   void SetBorderImageWidth(const BorderImageLengthBox&);
 
   // border-image-outset
   const BorderImageLengthBox& BorderImageOutset() const {
-    return surround_data_->border_.GetImage().Outset();
+    return BorderImage().Outset();
   }
   void SetBorderImageOutset(const BorderImageLengthBox&);
 
   // Border width properties.
   static float InitialBorderWidth() { return 3; }
 
   // TODO(nainar): Move all fixed point logic to a separate class.
   // border-top-width
   float BorderTopWidth() const {
     if (BorderTopStyle() == EBorderStyle::kNone ||
@@ skipping 2307 matching lines @@
   }
 
   // Border utility functions
   LayoutRectOutsets ImageOutsets(const NinePieceImage&) const;
   bool HasBorderImageOutsets() const {
     return BorderImage().HasImage() && BorderImage().Outset().NonZero();
   }
   LayoutRectOutsets BorderImageOutsets() const {
     return ImageOutsets(BorderImage());
   }
-  bool BorderImageSlicesFill() const { return Border().GetImage().Fill(); }
+  bool BorderImageSlicesFill() const { return BorderImage().Fill(); }
 
   void SetBorderImageSlicesFill(bool);
-  const BorderData& Border() const { return surround_data_->border_; }
   const BorderValue BorderLeft() const {
     return BorderValue(BorderLeftStyle(), BorderLeftColor(), BorderLeftWidth(),
                        OutlineStyleIsAuto());
   }
   const BorderValue BorderRight() const {
     return BorderValue(BorderRightStyle(), BorderRightColor(),
                        BorderRightWidth(), OutlineStyleIsAuto());
   }
   const BorderValue BorderTop() const {
     return BorderValue(BorderTopStyle(), BorderTopColor(), BorderTopWidth(),
@@ skipping 15 matching lines @@
   BorderValue BorderAfter() const;
   BorderValue BorderStart() const;
   BorderValue BorderEnd() const;
   float BorderAfterWidth() const;
   float BorderBeforeWidth() const;
   float BorderEndWidth() const;
   float BorderStartWidth() const;
   float BorderOverWidth() const;
   float BorderUnderWidth() const;
 
-  bool HasBorderFill() const { return Border().HasBorderFill(); }
+  bool HasBorderFill() const {
+    return BorderImage().HasImage() && BorderImage().Fill();
+  }
   bool HasBorder() const {
     return BorderLeftNonZero() || BorderRightNonZero() || BorderTopNonZero() ||
            BorderBottomNonZero();
   }
   bool HasBorderDecoration() const { return HasBorder() || HasBorderFill(); }
   bool HasBorderRadius() const {
     if (!BorderTopLeftRadius().Width().IsZero())
       return true;
     if (!BorderTopRightRadius().Width().IsZero())
       return true;
@@ skipping 91 matching lines @@
     return BorderLeftEquals(o) && BorderRightEquals(o) && BorderTopEquals(o) &&
            BorderBottomEquals(o) && BorderImage() == o.BorderImage();
   }
 
   bool BorderVisuallyEqual(const ComputedStyle& o) const {
     return BorderLeftVisuallyEqual(o) && BorderRightVisuallyEqual(o) &&
            BorderTopVisuallyEqual(o) && BorderBottomVisuallyEqual(o) &&
            BorderImage() == o.BorderImage();
   }
 
+  bool BorderVisualOverflowEqual(const ComputedStyle& o) const {
+    return BorderImage().Outset() == o.BorderImage().Outset();
+  }
+
   void ResetBorder() {
     ResetBorderImage();
     ResetBorderTop();
     ResetBorderRight();
     ResetBorderBottom();
     ResetBorderLeft();
     ResetBorderTopLeftRadius();
     ResetBorderTopRightRadius();
     ResetBorderBottomLeftRadius();
     ResetBorderBottomRightRadius();
   }
 
   void ResetBorderTop() {
     SetBorderTopStyle(EBorderStyle::kNone);
     SetBorderTopWidth(3);
     SetBorderTopColorInternal(0);
     SetBorderTopColorInternal(true);
-    SetBorderTopStyle(EBorderStyle::kNone);

[nainar, 2017/05/18 05:27:34]

These are remenants from a previous CL - clearing style twice :/

[shend, 2017/05/18 05:40:33]

:/

   }
   void ResetBorderRight() {
     SetBorderRightStyle(EBorderStyle::kNone);
     SetBorderRightWidth(3);
     SetBorderRightColorInternal(0);
     SetBorderRightColorInternal(true);
-    SetBorderRightStyle(EBorderStyle::kNone);
   }
   void ResetBorderBottom() {
     SetBorderBottomStyle(EBorderStyle::kNone);
     SetBorderBottomWidth(3);
     SetBorderBottomColorInternal(0);
     SetBorderBottomColorInternal(true);
-    SetBorderBottomStyle(EBorderStyle::kNone);
   }
   void ResetBorderLeft() {
     SetBorderLeftStyle(EBorderStyle::kNone);
     SetBorderLeftWidth(3);
     SetBorderLeftColorInternal(0);
     SetBorderLeftColorInternal(true);
-    SetBorderLeftStyle(EBorderStyle::kNone);
   }
-  void ResetBorderImage() {
-    SET_VAR(surround_data_, border_.image_, NinePieceImage());
-  }
+  void ResetBorderImage() { SetBorderImageInternal(NinePieceImage()); }

[shend, 2017/05/18 05:40:33]

When we generate border-image as external, we get this function for free as
well.

[nainar, 2017/05/18 06:00:50]

Got it. 

 
   void SetBorderRadius(const LengthSize& s) {
     SetBorderTopLeftRadius(s);
     SetBorderTopRightRadius(s);
     SetBorderBottomLeftRadius(s);
     SetBorderBottomRightRadius(s);
   }
   void SetBorderRadius(const IntSize& s) {
     SetBorderRadius(
         LengthSize(Length(s.Width(), kFixed), Length(s.Height(), kFixed)));
@@ skipping 788 matching lines @@
       PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
   return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink
 
 #endif  // ComputedStyle_h