Don't render border images when border-style is none

third_party/WebKit/Source/core/style/BorderData.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
@@ skipping 28 matching lines @@
 public:
     BorderData() : m_topLeft(Length(0, Fixed), Length(0, Fixed))
         , m_topRight(Length(0, Fixed), Length(0, Fixed))
         , m_bottomLeft(Length(0, Fixed), Length(0, Fixed))
         , m_bottomRight(Length(0, Fixed), Length(0, Fixed))
     {
     }
 
     bool hasBorder() const
     {
-        bool haveImage = m_image.hasImage();
-        return m_left.nonZero(!haveImage) || m_right.nonZero(!haveImage) || m_top.nonZero(!haveImage) || m_bottom.nonZero(!haveImage);
+        return m_left.nonZero() || m_right.nonZero() || m_top.nonZero() || m_bottom.nonZero();
     }
 
     bool hasBorderFill() const
     {
         return m_image.hasImage() && m_image.fill();
     }
 
     bool hasBorderRadius() const
     {
         if (!m_topLeft.width().isZero())
             return true;
         if (!m_topRight.width().isZero())
             return true;
         if (!m_bottomLeft.width().isZero())
             return true;
         if (!m_bottomRight.width().isZero())
             return true;
         return false;
     }
 
     int borderLeftWidth() const
     {
-        if (!m_image.hasImage() && (m_left.style() == BNONE || m_left.style() == BHIDDEN))
+        if (m_left.style() == BNONE || m_left.style() == BHIDDEN)
             return 0;
         return m_left.width();
     }
 
     int borderRightWidth() const
     {
-        if (!m_image.hasImage() && (m_right.style() == BNONE || m_right.style() == BHIDDEN))
+        if (m_right.style() == BNONE || m_right.style() == BHIDDEN)
             return 0;
         return m_right.width();
     }
 
     int borderTopWidth() const
     {
-        if (!m_image.hasImage() && (m_top.style() == BNONE || m_top.style() == BHIDDEN))
+        if (m_top.style() == BNONE || m_top.style() == BHIDDEN)
             return 0;
         return m_top.width();
     }
 
     int borderBottomWidth() const
     {
-        if (!m_image.hasImage() && (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN))
+        if (m_bottom.style() == BNONE || m_bottom.style() == BHIDDEN)
             return 0;
         return m_bottom.width();
     }
 
     bool operator==(const BorderData& o) const
     {
         return m_left == o.m_left && m_right == o.m_right && m_top == o.m_top && m_bottom == o.m_bottom && m_image == o.m_image
                && m_topLeft == o.m_topLeft && m_topRight == o.m_topRight && m_bottomLeft == o.m_bottomLeft && m_bottomRight == o.m_bottomRight;
     }
 
@@ skipping 37 matching lines @@
 
     LengthSize m_topLeft;
     LengthSize m_topRight;
     LengthSize m_bottomLeft;
     LengthSize m_bottomRight;
 };
 
 } // namespace blink
 
 #endif // BorderData_h