Remove dependency on order of enum EBorderStyle

third_party/WebKit/Source/core/layout/CollapsedBorderValue.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 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef CollapsedBorderValue_h
 #define CollapsedBorderValue_h
 
-#include "core/style/BorderValue.h"
+#include "core/style/ComputedStyle.h"
 #include "platform/wtf/Allocator.h"
 
 namespace blink {
 
 enum EBorderPrecedence {
   kBorderPrecedenceOff,
   kBorderPrecedenceTable,
   kBorderPrecedenceColumnGroup,
   kBorderPrecedenceColumn,
   kBorderPrecedenceRowGroup,
   kBorderPrecedenceRow,
   kBorderPrecedenceCell
 };
 
 class CollapsedBorderValue {
   DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 
  public:
   // Constructs a CollapsedBorderValue for non-existence border.
   CollapsedBorderValue()
       : color_(0),
         width_(0),
         style_(static_cast<unsigned>(EBorderStyle::kNone)),
         precedence_(kBorderPrecedenceOff) {}
 
   CollapsedBorderValue(const BorderValue& border,
                        const Color& color,
                        EBorderPrecedence precedence)
       : color_(color),
-        width_(border.Style() > EBorderStyle::kHidden ? border.Width() : 0),
+        width_(ComputedStyle::BorderStyleIsVisible(border.Style())
+                   ? border.Width()
+                   : 0),
         style_(static_cast<unsigned>(border.Style())),
         precedence_(precedence) {
     DCHECK(precedence != kBorderPrecedenceOff);
   }
 
   unsigned Width() const { return width_; }
   EBorderStyle Style() const { return static_cast<EBorderStyle>(style_); }
   bool Exists() const { return precedence_ != kBorderPrecedenceOff; }
   Color GetColor() const { return color_; }
   bool IsTransparent() const { return !color_.Alpha(); }
@@ skipping 23 matching lines @@
  private:
   Color color_;
   unsigned width_ : 25;
   unsigned style_ : 4;       // EBorderStyle
   unsigned precedence_ : 3;  // EBorderPrecedence
 };
 
 }  // namespace blink
 
 #endif  // CollapsedBorderValue_h