Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

1 files changed, 4 insertions, 2 deletions

diff --git a/WebCore/rendering/style/FillLayer.h b/WebCore/rendering/style/FillLayer.h
index cef6b19..eb21ec3 100644
--- a/WebCore/rendering/style/FillLayer.h
+++ b/WebCore/rendering/style/FillLayer.h
@@ -59,7 +59,7 @@ struct FillSize {
     LengthSize size;
 };
 
-struct FillLayer : FastAllocBase {
+class FillLayer : public FastAllocBase {
 public:
     FillLayer(EFillLayerType);
     ~FillLayer();
@@ -74,6 +74,7 @@ public:
     EFillRepeat repeatY() const { return static_cast<EFillRepeat>(m_repeatY); }
     CompositeOperator composite() const { return static_cast<CompositeOperator>(m_composite); }
     LengthSize sizeLength() const { return m_sizeLength; }
+    EFillSizeType sizeType() const { return static_cast<EFillSizeType>(m_sizeType); }
     FillSize size() const { return FillSize(static_cast<EFillSizeType>(m_sizeType), m_sizeLength); }
 
     const FillLayer* next() const { return m_next; }
@@ -161,9 +162,10 @@ public:
     static StyleImage* initialFillImage(EFillLayerType) { return 0; }
 
 private:
+    friend class RenderStyle;
+
     FillLayer() { }
 
-public:
     RefPtr<StyleImage> m_image;
 
     Length m_xPosition;