Changeset 57371 in webkit

Timestamp:

Apr 9, 2010 3:14:15 PM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=37361, clean up FillLayer.

Reviewed by Oliver Hunt.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

• rendering/style/FillLayer.h:

(WebCore::FillLayer::sizeType):

• rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::backgroundImage):
(WebCore::InheritedFlags::backgroundRepeatX):
(WebCore::InheritedFlags::backgroundRepeatY):
(WebCore::InheritedFlags::backgroundComposite):
(WebCore::InheritedFlags::backgroundAttachment):
(WebCore::InheritedFlags::backgroundClip):
(WebCore::InheritedFlags::backgroundOrigin):
(WebCore::InheritedFlags::backgroundXPosition):
(WebCore::InheritedFlags::backgroundYPosition):
(WebCore::InheritedFlags::backgroundSizeType):
(WebCore::InheritedFlags::backgroundSizeLength):
(WebCore::InheritedFlags::maskImage):
(WebCore::InheritedFlags::maskRepeatX):
(WebCore::InheritedFlags::maskRepeatY):
(WebCore::InheritedFlags::maskComposite):
(WebCore::InheritedFlags::maskAttachment):
(WebCore::InheritedFlags::maskClip):
(WebCore::InheritedFlags::maskOrigin):
(WebCore::InheritedFlags::maskXPosition):
(WebCore::InheritedFlags::maskYPosition):
(WebCore::InheritedFlags::maskSizeType):
(WebCore::InheritedFlags::maskSizeLength):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• rendering/style/FillLayer.h (modified) (3 diffs)
• rendering/style/RenderStyle.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-09  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37361, clean up FillLayer.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+        * rendering/style/FillLayer.h:
+        (WebCore::FillLayer::sizeType):
+        * rendering/style/RenderStyle.h:
+        (WebCore::InheritedFlags::backgroundImage):
+        (WebCore::InheritedFlags::backgroundRepeatX):
+        (WebCore::InheritedFlags::backgroundRepeatY):
+        (WebCore::InheritedFlags::backgroundComposite):
+        (WebCore::InheritedFlags::backgroundAttachment):
+        (WebCore::InheritedFlags::backgroundClip):
+        (WebCore::InheritedFlags::backgroundOrigin):
+        (WebCore::InheritedFlags::backgroundXPosition):
+        (WebCore::InheritedFlags::backgroundYPosition):
+        (WebCore::InheritedFlags::backgroundSizeType):
+        (WebCore::InheritedFlags::backgroundSizeLength):
+        (WebCore::InheritedFlags::maskImage):
+        (WebCore::InheritedFlags::maskRepeatX):
+        (WebCore::InheritedFlags::maskRepeatY):
+        (WebCore::InheritedFlags::maskComposite):
+        (WebCore::InheritedFlags::maskAttachment):
+        (WebCore::InheritedFlags::maskClip):
+        (WebCore::InheritedFlags::maskOrigin):
+        (WebCore::InheritedFlags::maskXPosition):
+        (WebCore::InheritedFlags::maskYPosition):
+        (WebCore::InheritedFlags::maskSizeType):
+        (WebCore::InheritedFlags::maskSizeLength):
+
 2010-04-09  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -959 +959 @@
             return CSSPrimitiveValue::createIdentifier(CSSValueNone);
         case CSSPropertyWebkitMaskSize: {
+            EFillSizeType size = style->maskSizeType();
+            if (size == Contain)
+                return CSSPrimitiveValue::createIdentifier(CSSValueContain);
+            if (size == Cover)
+                return CSSPrimitiveValue::createIdentifier(CSSValueCover);
             RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
-            list->append(CSSPrimitiveValue::create(style->maskSize().width()));
-            list->append(CSSPrimitiveValue::create(style->maskSize().height()));
+            list->append(CSSPrimitiveValue::create(style->maskSizeLength().width()));
+            list->append(CSSPrimitiveValue::create(style->maskSizeLength().height()));
             return list.release();
         }  

trunk/WebCore/rendering/style/FillLayer.h

@@ -60 +60 @@
 };
 
-struct FillLayer : FastAllocBase {
+class FillLayer : public FastAllocBase {
 public:
     FillLayer(EFillLayerType);
@@ -75 +75 @@
     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); }
 
@@ -162 +163 @@
 
 private:
+    friend class RenderStyle;
+
     FillLayer() { }
 
-public:
     RefPtr<StyleImage> m_image;
 

trunk/WebCore/rendering/style/RenderStyle.h

@@ -536 +536 @@
 
     const Color& backgroundColor() const { return background->m_color; }
-    StyleImage* backgroundImage() const { return background->m_background.m_image.get(); }
-    EFillRepeat backgroundRepeatX() const { return static_cast<EFillRepeat>(background->m_background.m_repeatX); }
-    EFillRepeat backgroundRepeatY() const { return static_cast<EFillRepeat>(background->m_background.m_repeatY); }
-    CompositeOperator backgroundComposite() const { return static_cast<CompositeOperator>(background->m_background.m_composite); }
-    EFillAttachment backgroundAttachment() const { return static_cast<EFillAttachment>(background->m_background.m_attachment); }
-    EFillBox backgroundClip() const { return static_cast<EFillBox>(background->m_background.m_clip); }
-    EFillBox backgroundOrigin() const { return static_cast<EFillBox>(background->m_background.m_origin); }
-    Length backgroundXPosition() const { return background->m_background.m_xPosition; }
-    Length backgroundYPosition() const { return background->m_background.m_yPosition; }
-    EFillSizeType backgroundSizeType() const { return static_cast<EFillSizeType>(background->m_background.m_sizeType); }
-    LengthSize backgroundSizeLength() const { return background->m_background.m_sizeLength; }
+    StyleImage* backgroundImage() const { return background->m_background.image(); }
+    EFillRepeat backgroundRepeatX() const { return static_cast<EFillRepeat>(background->m_background.repeatX()); }
+    EFillRepeat backgroundRepeatY() const { return static_cast<EFillRepeat>(background->m_background.repeatY()); }
+    CompositeOperator backgroundComposite() const { return static_cast<CompositeOperator>(background->m_background.composite()); }
+    EFillAttachment backgroundAttachment() const { return static_cast<EFillAttachment>(background->m_background.attachment()); }
+    EFillBox backgroundClip() const { return static_cast<EFillBox>(background->m_background.clip()); }
+    EFillBox backgroundOrigin() const { return static_cast<EFillBox>(background->m_background.origin()); }
+    Length backgroundXPosition() const { return background->m_background.xPosition(); }
+    Length backgroundYPosition() const { return background->m_background.yPosition(); }
+    EFillSizeType backgroundSizeType() const { return background->m_background.sizeType(); }
+    LengthSize backgroundSizeLength() const { return background->m_background.sizeLength(); }
     FillLayer* accessBackgroundLayers() { return &(background.access()->m_background); }
     const FillLayer* backgroundLayers() const { return &(background->m_background); }
 
-    StyleImage* maskImage() const { return rareNonInheritedData->m_mask.m_image.get(); }
-    EFillRepeat maskRepeatX() const { return static_cast<EFillRepeat>(rareNonInheritedData->m_mask.m_repeatX); }
-    EFillRepeat maskRepeatY() const { return static_cast<EFillRepeat>(rareNonInheritedData->m_mask.m_repeatY); }
-    CompositeOperator maskComposite() const { return static_cast<CompositeOperator>(rareNonInheritedData->m_mask.m_composite); }
-    EFillAttachment maskAttachment() const { return static_cast<EFillAttachment>(rareNonInheritedData->m_mask.m_attachment); }
-    EFillBox maskClip() const { return static_cast<EFillBox>(rareNonInheritedData->m_mask.m_clip); }
-    EFillBox maskOrigin() const { return static_cast<EFillBox>(rareNonInheritedData->m_mask.m_origin); }
-    Length maskXPosition() const { return rareNonInheritedData->m_mask.m_xPosition; }
-    Length maskYPosition() const { return rareNonInheritedData->m_mask.m_yPosition; }
-    LengthSize maskSize() const { return rareNonInheritedData->m_mask.m_sizeLength; }
+    StyleImage* maskImage() const { return rareNonInheritedData->m_mask.image(); }
+    EFillRepeat maskRepeatX() const { return static_cast<EFillRepeat>(rareNonInheritedData->m_mask.repeatX()); }
+    EFillRepeat maskRepeatY() const { return static_cast<EFillRepeat>(rareNonInheritedData->m_mask.repeatY()); }
+    CompositeOperator maskComposite() const { return static_cast<CompositeOperator>(rareNonInheritedData->m_mask.composite()); }
+    EFillAttachment maskAttachment() const { return static_cast<EFillAttachment>(rareNonInheritedData->m_mask.attachment()); }
+    EFillBox maskClip() const { return static_cast<EFillBox>(rareNonInheritedData->m_mask.clip()); }
+    EFillBox maskOrigin() const { return static_cast<EFillBox>(rareNonInheritedData->m_mask.origin()); }
+    Length maskXPosition() const { return rareNonInheritedData->m_mask.xPosition(); }
+    Length maskYPosition() const { return rareNonInheritedData->m_mask.yPosition(); }
+    EFillSizeType maskSizeType() const { return rareNonInheritedData->m_mask.sizeType(); }
+    LengthSize maskSizeLength() const { return rareNonInheritedData->m_mask.sizeLength(); }
     FillLayer* accessMaskLayers() { return &(rareNonInheritedData.access()->m_mask); }
     const FillLayer* maskLayers() const { return &(rareNonInheritedData->m_mask); }