Make ComputedStyle::InheritFrom group independent.

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 294 matching lines @@
 }
 
 ContentDistributionType ComputedStyle::ResolvedAlignContentDistribution(
     const StyleContentAlignmentData& normal_value_behavior) const {
   return ResolvedContentAlignmentDistribution(AlignContent(),
                                               normal_value_behavior);
 }
 
 void ComputedStyle::InheritFrom(const ComputedStyle& inherit_parent,
                                 IsAtShadowBoundary is_at_shadow_boundary) {
+  EUserModify current_user_modify = UserModify();
+
   ComputedStyleBase::InheritFrom(inherit_parent, is_at_shadow_boundary);

[alancutter (OOO until 2018), 2017/05/09 00:09:18]

Unrelated to this patch: Why does this function take is_at_shadow_boundary? It
doesn't appear to use it.

[shend, 2017/05/09 00:16:02]

I think ComputedStyleBase::InheritFrom was created as a direct copy of
ComputedStyle::InheritFrom, in case we want to replace ComputedStyle with
ComputedStyleBase. IMO, such an endeavour is very complicated and I don't think
it's worth. So in the near future, no, is_at_shadow_boundary does not need to be
in ComputedStyleBase::InheritFrom.

+  rare_inherited_data_ = inherit_parent.rare_inherited_data_;
+  inherited_data_ = inherit_parent.inherited_data_;
+  if (svg_style_ != inherit_parent.svg_style_)
+    svg_style_.Access()->InheritFrom(inherit_parent.svg_style_.Get());
+
   if (is_at_shadow_boundary == kAtShadowBoundary) {
     // Even if surrounding content is user-editable, shadow DOM should act as a
     // single unit, and not necessarily be editable
-    EUserModify current_user_modify = UserModify();
-    rare_inherited_data_ = inherit_parent.rare_inherited_data_;
     SetUserModify(current_user_modify);
-  } else {
-    rare_inherited_data_ = inherit_parent.rare_inherited_data_;
   }
-  inherited_data_ = inherit_parent.inherited_data_;
-  if (svg_style_ != inherit_parent.svg_style_)
-    svg_style_.Access()->InheritFrom(inherit_parent.svg_style_.Get());
 }
 
 void ComputedStyle::CopyNonInheritedFromCached(const ComputedStyle& other) {
   ComputedStyleBase::CopyNonInheritedFromCached(other);
   box_data_ = other.box_data_;
   visual_data_ = other.visual_data_;
   rare_non_inherited_data_ = other.rare_non_inherited_data_;
 
   // The flags are copied one-by-one because they contain
   // bunch of stuff other than real style data.
@@ skipping 2168 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return RoundForImpreciseConversion<int>(fvalue / zoom_factor);
 }
 
 }  // namespace blink