Use generated getters/setters in ComputedStyle instead of directly accessing fields

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

Index: third_party/WebKit/Source/core/style/ComputedStyle.h
diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 3697dea24c80315c5e02409cd77631f0e307aae5..004bc9d79d25c944f2c399dee72572374b6c7dc3 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -257,8 +257,8 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
                    IsAtShadowBoundary = kNotAtShadowBoundary);
   void CopyNonInheritedFromCached(const ComputedStyle&);
 
-  PseudoId StyleType() const { return static_cast<PseudoId>(style_type_); }
-  void SetStyleType(PseudoId style_type) { style_type_ = style_type; }
+  PseudoId StyleType() const { return StyleTypeInternal(); }
+  void SetStyleType(PseudoId style_type) { SetStyleTypeInternal(style_type); }
 
   ComputedStyle* GetCachedPseudoStyle(PseudoId) const;
   ComputedStyle* AddCachedPseudoStyle(PassRefPtr<ComputedStyle>);
@@ -1633,15 +1633,11 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
   static EVerticalAlign InitialVerticalAlign() {
     return EVerticalAlign::kBaseline;
   }
-  EVerticalAlign VerticalAlign() const {
-    return static_cast<EVerticalAlign>(vertical_align_);
-  }
+  EVerticalAlign VerticalAlign() const { return VerticalAlignInternal(); }
   const Length& GetVerticalAlignLength() const { return box_->VerticalAlign(); }
-  void SetVerticalAlign(EVerticalAlign v) {
-    vertical_align_ = static_cast<unsigned>(v);
-  }
+  void SetVerticalAlign(EVerticalAlign v) { SetVerticalAlignInternal(v); }
   void SetVerticalAlignLength(const Length& length) {
-    SetVerticalAlign(EVerticalAlign::kLength);
+    SetVerticalAlignInternal(EVerticalAlign::kLength);
     SET_VAR(box_, vertical_align_, length);
   }
 
@@ -2238,7 +2234,7 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
   bool InheritedDataShared(const ComputedStyle&) const;
 
   bool HasChildDependentFlags() const {
-    return EmptyState() || HasExplicitlyInheritedProperties();
+    return EmptyStateInternal() || HasExplicitlyInheritedProperties();
   }
   void CopyChildDependentFlagsFrom(const ComputedStyle&);
 
@@ -2307,10 +2303,10 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
   void AddCallbackSelector(const String& selector);
 
   // Non-property flags.
-  bool EmptyState() const { return empty_state_; }
+  bool EmptyState() const { return EmptyStateInternal(); }
   void SetEmptyState(bool b) {
     SetUnique();
-    empty_state_ = b;
+    SetEmptyStateInternal(b);
   }
 
   bool HasInlineTransform() const {
@@ -3698,23 +3694,24 @@ inline bool ComputedStyle::SetTextOrientation(
 }
 
 inline bool ComputedStyle::HasAnyPublicPseudoStyles() const {
-  return pseudo_bits_;
+  return PseudoBitsInternal();

[suzyh_UTC10 (ex-contributor), 2017/04/20 00:30:46]

It looks like pseudo_bits_ is a PseudoId, not a bool. Now that there is an extra
layer of indirection here, is there value in making the conversion explicit?

[nainar, 2017/04/20 03:06:16]

Do you mean cast PseudoBitsInternal() to a bool? 

[suzyh_UTC10 (ex-contributor), 2017/04/20 03:40:26]

I'm actually not sure what the right way to do it is.

I suppose you could also do
return PseudoBitsInternal() != kPseudoIdNone
?

[nainar, 2017/04/20 05:21:49]

That works. Done

 }
 
 inline bool ComputedStyle::HasPseudoStyle(PseudoId pseudo) const {
   DCHECK(pseudo >= kFirstPublicPseudoId);
   DCHECK(pseudo < kFirstInternalPseudoId);
-  return (1 << (pseudo - kFirstPublicPseudoId)) & pseudo_bits_;
+  return (1 << (pseudo - kFirstPublicPseudoId)) & PseudoBitsInternal();
 }
 
 inline void ComputedStyle::SetHasPseudoStyle(PseudoId pseudo) {
   DCHECK(pseudo >= kFirstPublicPseudoId);
   DCHECK(pseudo < kFirstInternalPseudoId);
-  pseudo_bits_ |= 1 << (pseudo - kFirstPublicPseudoId);
+  SetPseudoBitsInternal(static_cast<PseudoId>(
+      PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));

[suzyh_UTC10 (ex-contributor), 2017/04/20 00:30:46]

This is getting nasty. Consider adding a TODO to make the operations on these
enums easier to grok.

[nainar, 2017/04/20 03:06:16]

Added a comment explaining what the code represents here. 

[suzyh_UTC10 (ex-contributor), 2017/04/20 03:40:26]

Hmm nope that's not really much more helpful. Before your patch this code was
bit-twiddling black magic. Now it is obscured bit-twiddling black magic with a
comment that may get out of date with the code. I think remove the comment again
and just add a TODO to fix it up later. (I don't want to block this patch on
fixing it.)

[nainar, 2017/04/20 05:21:49]

Done.

 }
 
 inline bool ComputedStyle::HasPseudoElementStyle() const {
-  return pseudo_bits_ & kElementPseudoIdMask;
+  return PseudoBitsInternal() & kElementPseudoIdMask;
 }
 
 }  // namespace blink