Changeset 13384 in webkit

Timestamp:

Mar 18, 2006 10:05:00 PM (18 years ago)

Author:

darin

Message:

LayoutTests:

Reviewed by Darin.

• test for ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7830 <canvas> createPattern 'repeat' options fail

• fast/canvas/patternfill-repeat-expected.checksum: Added.
• fast/canvas/patternfill-repeat-expected.png: Added.
• fast/canvas/patternfill-repeat-expected.txt: Added.
• fast/canvas/patternfill-repeat.html: Added.

WebCore:

Test: fast/canvas/patternfill-repeat.html

Reviewed by Darin.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7830 <canvas> createPattern 'repeat' options fail

• CanvasPattern.cpp (CanvasPattern::createPattern) Change stepping so that repeat-x, repeat-y, and no-repeat repeat outside the view area by using large values for repeat interval.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/canvas/patternfill-repeat-expected.checksum (added)
• LayoutTests/fast/canvas/patternfill-repeat-expected.txt (added)
• LayoutTests/fast/canvas/patternfill-repeat.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/CanvasPattern.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-03-18  David Carson  <dacarson@gmail.com>        
+
+        Reviewed by Darin.
+
+        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=7830
+          <canvas> createPattern 'repeat' options fail
+
+        * fast/canvas/patternfill-repeat-expected.checksum: Added.
+        * fast/canvas/patternfill-repeat-expected.png: Added.
+        * fast/canvas/patternfill-repeat-expected.txt: Added.
+        * fast/canvas/patternfill-repeat.html: Added.
+
 2006-03-18  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-03-18  David Carson  <dacarson@gmail.com>
+
+        Test: fast/canvas/patternfill-repeat.html
+
+        Reviewed by Darin.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=7830
+          <canvas> createPattern 'repeat' options fail
+
+        * CanvasPattern.cpp (CanvasPattern::createPattern)
+        Change stepping so that repeat-x, repeat-y, and no-repeat repeat 
+        outside the view area by using large values for repeat interval.
+
 2006-03-18  Mitz Pettel  <opendarwin.org@mitzpettel.com>
 

trunk/WebCore/html/CanvasPattern.cpp

@@ -86 +86 @@
         CGAffineTransformTranslate(CGAffineTransformScale(transform, 1, -1), 0, -image->height());
 
-    float xStep = m_repeatX ? image->width() : 0;
-    float yStep = m_repeatY ? image->height() : 0;
+    float xStep = m_repeatX ? image->width() : FLT_MAX;
+    // If FLT_MAX should also be used for yStep, nothing is rendered. Using fractions of FLT_MAX also
+    // result in nothing being rendered. This is not a problem with xStep.
+    // INT_MAX is almost correct, but there seems to be some number wrapping occuring making the fill
+    // pattern is not filled correctly. 
+    // So, just pick a really large number that works. 
+    float yStep = m_repeatY ? image->height() : (100000000.0);
 
     const CGPatternCallbacks patternCallbacks = { 0, patternCallback, patternReleaseCallback };