Changeset 23558 in webkit

Timestamp:

Jun 15, 2007 8:14:56 PM (17 years ago)

Author:

hyatt

Message:

Fix for bugzilla bugs 14183 and 14184, 'repeat' regressed in border-image
because of a botched 'round' support removal. Also update for a change in
the spec that has the second stretch/round/repeat keyword match the first
if omitted.

Reviewed by olliej

• css/cssparser.cpp: (WebCore::BorderImageParseContext::commitBorderImage):
• platform/graphics/Image.cpp: (WebCore::Image::drawTiled):
• platform/graphics/Image.h: (WebCore::Image::):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/cssparser.cpp (modified) (1 diff)
• platform/graphics/Image.cpp (modified) (1 diff)
• platform/graphics/Image.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-15  David Hyatt  <hyatt@apple.com>
+
+        Fix for bugzilla bugs 14183 and 14184, 'repeat' regressed in border-image
+        because of a botched 'round' support removal.  Also update for a change in
+        the spec that has the second stretch/round/repeat keyword match the first
+        if omitted.
+        
+        Reviewed by olliej
+
+        * css/cssparser.cpp:
+        (WebCore::BorderImageParseContext::commitBorderImage):
+        * platform/graphics/Image.cpp:
+        (WebCore::Image::drawTiled):
+        * platform/graphics/Image.h:
+        (WebCore::Image::):
+
 2007-06-15  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/css/cssparser.cpp

@@ -2825 +2825 @@
         if (!m_horizontalRule)
             m_horizontalRule = CSS_VAL_STRETCH;
+            
+        // The vertical rule should match the horizontal rule if unspecified.
         if (!m_verticalRule)
-            m_verticalRule = CSS_VAL_STRETCH;
+            m_verticalRule = m_horizontalRule;
 
         // Make our new border image value now and add it as the result.

trunk/WebCore/platform/graphics/Image.cpp

@@ -175 +175 @@
     }
     
+    // FIXME: We do not support 'round' yet.  For now just map it to 'repeat'.
+    if (hRule == RoundTile)
+        hRule = RepeatTile;
+    if (vRule == RoundTile)
+        vRule = RepeatTile;
+
     FloatSize scale = calculatePatternScale(dstRect, srcRect, hRule, vRule);
     AffineTransform patternTransform = AffineTransform().scale(scale.width(), scale.height());

trunk/WebCore/platform/graphics/Image.h

@@ -105 +105 @@
     ImageObserver* imageObserver() const { return m_imageObserver; }
 
-    enum TileRule { StretchTile, RepeatTile };
+    enum TileRule { StretchTile, RoundTile, RepeatTile };
     
 #if PLATFORM(MAC)