Introduce BorderImageLength and BorderImageLengthBox

Source/core/rendering/style/NinePieceImage.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, 2013 Apple Inc. 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.
  *
  * 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 NinePieceImage_h
 #define NinePieceImage_h
 
 #include "core/rendering/style/DataRef.h"
 #include "core/rendering/style/StyleImage.h"
+#include "platform/BorderImageLengthBox.h"
 #include "platform/LayoutUnit.h"
 #include "platform/LengthBox.h"
 
 namespace WebCore {
 
 enum ENinePieceImageRule {
     StretchImageRule, RoundImageRule, SpaceImageRule, RepeatImageRule
 };
 
 class NinePieceImageData : public RefCounted<NinePieceImageData> {
 public:
     static PassRefPtr<NinePieceImageData> create() { return adoptRef(new NinePieceImageData); }
     PassRefPtr<NinePieceImageData> copy() const { return adoptRef(new NinePieceImageData(*this)); }
 
     bool operator==(const NinePieceImageData&) const;
     bool operator!=(const NinePieceImageData& o) const { return !(*this == o); }
 
     bool fill : 1;
     unsigned horizontalRule : 2; // ENinePieceImageRule
     unsigned verticalRule : 2; // ENinePieceImageRule
     RefPtr<StyleImage> image;
     LengthBox imageSlices;
-    LengthBox borderSlices;
-    LengthBox outset;
+    BorderImageLengthBox borderSlices;
+    BorderImageLengthBox outset;
 
 private:
     NinePieceImageData();
     NinePieceImageData(const NinePieceImageData&);
 };
 
 class NinePieceImage {
 public:
     NinePieceImage();
-    NinePieceImage(PassRefPtr<StyleImage>, LengthBox imageSlices, bool fill, LengthBox borderSlices, LengthBox outset, ENinePieceImageRule horizontalRule, ENinePieceImageRule verticalRule);
+    NinePieceImage(PassRefPtr<StyleImage>, LengthBox imageSlices, bool fill, BorderImageLengthBox borderSlices, BorderImageLengthBox outset, ENinePieceImageRule horizontalRule, ENinePieceImageRule verticalRule);

[Julien - ping for review, 2013/11/04 16:31:40]

Nit: const BorderImageLengthBox& ?

 
     bool operator==(const NinePieceImage& other) const { return m_data == other.m_data; }
     bool operator!=(const NinePieceImage& other) const { return m_data != other.m_data; }
 
     bool hasImage() const { return m_data->image; }
     StyleImage* image() const { return m_data->image.get(); }
     void setImage(PassRefPtr<StyleImage> image) { m_data.access()->image = image; }
 
     const LengthBox& imageSlices() const { return m_data->imageSlices; }
     void setImageSlices(const LengthBox& slices) { m_data.access()->imageSlices = slices; }
 
     bool fill() const { return m_data->fill; }
     void setFill(bool fill) { m_data.access()->fill = fill; }
 
-    const LengthBox& borderSlices() const { return m_data->borderSlices; }
-    void setBorderSlices(const LengthBox& slices) { m_data.access()->borderSlices = slices; }
+    const BorderImageLengthBox& borderSlices() const { return m_data->borderSlices; }
+    void setBorderSlices(const BorderImageLengthBox& slices) { m_data.access()->borderSlices = slices; }
 
-    const LengthBox& outset() const { return m_data->outset; }
-    void setOutset(const LengthBox& outset) { m_data.access()->outset = outset; }
+    const BorderImageLengthBox& outset() const { return m_data->outset; }
+    void setOutset(const BorderImageLengthBox& outset) { m_data.access()->outset = outset; }
 
     ENinePieceImageRule horizontalRule() const { return static_cast<ENinePieceImageRule>(m_data->horizontalRule); }
     void setHorizontalRule(ENinePieceImageRule rule) { m_data.access()->horizontalRule = rule; }
 
     ENinePieceImageRule verticalRule() const { return static_cast<ENinePieceImageRule>(m_data->verticalRule); }
     void setVerticalRule(ENinePieceImageRule rule) { m_data.access()->verticalRule = rule; }
 
     void copyImageSlicesFrom(const NinePieceImage& other)
     {
         m_data.access()->imageSlices = other.m_data->imageSlices;
@@ skipping 13 matching lines @@
     void copyRepeatFrom(const NinePieceImage& other)
     {
         m_data.access()->horizontalRule = other.m_data->horizontalRule;
         m_data.access()->verticalRule = other.m_data->verticalRule;
     }
 
     void setMaskDefaults()
     {
         m_data.access()->imageSlices = LengthBox(0);
         m_data.access()->fill = true;
-        m_data.access()->borderSlices = LengthBox();
+        m_data.access()->borderSlices = BorderImageLengthBox();
     }
 
-    static LayoutUnit computeOutset(Length outsetSide, LayoutUnit borderSide)
+    static LayoutUnit computeOutset(const BorderImageLength& outsetSide, LayoutUnit borderSide)
     {
-        if (outsetSide.isRelative())
-            return outsetSide.value() * borderSide;
-        return outsetSide.value();
+        if (outsetSide.isNumber())
+            return outsetSide.number() * borderSide;
+        return outsetSide.length().value();
     }
 
 private:
     DataRef<NinePieceImageData> m_data;
 };
 
 } // namespace WebCore
 
 #endif // NinePieceImage_h