Reviewed by Hyatt.

        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8495
        REGRESSION: Sidebar on cnn.com is hosed

        * platform/mac/ImageMac.mm:
        (WebCore::Image::drawTiled): Use the size of the destination rect,
        not the oneTileRect in the no-pattern case.
        * rendering/RenderBox.cpp:
        (WebCore::RenderBox::paintBackgroundExtended): Initialize
        scaledWidth and scaledHeight to the appropriate value (was wrong in
        scroll case), adjust position at appropriate times, and take out
        no-repeat clause for now since we don't have enough test cases yet
        to be sure we won't cause massive regressions.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c1a14456afbec8e59e0fc4e7d030ad0613dcd008..9d708c4793cfef39d00d677e3a6f732e28dae3ed 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,151 @@
+2006-04-21  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Hyatt.
+
+        Moved all of the background tests into background directory, and
+        added test for http://bugzilla.opendarwin.org/show_bug.cgi?id=8495
+        REGRESSION: Sidebar on cnn.com is hosed
+
+        * fast/backgrounds/repeat: Added.
+        * fast/backgrounds/repeat/noRepeatCorrectClip-expected.checksum: Added.
+        * fast/backgrounds/repeat/noRepeatCorrectClip-expected.png: Added.
+        * fast/backgrounds/repeat/noRepeatCorrectClip-expected.txt: Added.
+        * fast/backgrounds/repeat/noRepeatCorrectClip.html: Added.
+        * fast/backgrounds/repeat/resources: Added.
+        * fast/backgrounds/repeat/resources/nav.blue.gif: Added.
+        * fast/backgrounds/size: Added.
+        * fast/backgrounds/size/backgroundSize01-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize01-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize01-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize01.html: Added.
+        * fast/backgrounds/size/backgroundSize02-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize02-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize02-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize02.html: Added.
+        * fast/backgrounds/size/backgroundSize03-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize03-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize03-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize03.html: Added.
+        * fast/backgrounds/size/backgroundSize04-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize04-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize04-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize04.html: Added.
+        * fast/backgrounds/size/backgroundSize05-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize05-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize05-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize05.html: Added.
+        * fast/backgrounds/size/backgroundSize06-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize06-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize06-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize06.html: Added.
+        * fast/backgrounds/size/backgroundSize07-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize07-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize07-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize07.html: Added.
+        * fast/backgrounds/size/backgroundSize08-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize08-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize08-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize08.html: Added.
+        * fast/backgrounds/size/backgroundSize09-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize09-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize09-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize09.html: Added.
+        * fast/backgrounds/size/backgroundSize10-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize10-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize10-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize10.html: Added.
+        * fast/backgrounds/size/backgroundSize11-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize11-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize11-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize11.html: Added.
+        * fast/backgrounds/size/backgroundSize12-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize12-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize12-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize12.html: Added.
+        * fast/backgrounds/size/backgroundSize13-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize13-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize13-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize13.html: Added.
+        * fast/backgrounds/size/backgroundSize14-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize14-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize14-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize14.html: Added.
+        * fast/backgrounds/size/backgroundSize15-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize15-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize15-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize15.html: Added.
+        * fast/backgrounds/size/backgroundSize16-expected.checksum: Added.
+        * fast/backgrounds/size/backgroundSize16-expected.png: Added.
+        * fast/backgrounds/size/backgroundSize16-expected.txt: Added.
+        * fast/backgrounds/size/backgroundSize16.html: Added.
+        * fast/backgrounds/size/resources: Added.
+        * fast/backgrounds/size/resources/bikes.bmp: Added.
+        * fast/css/backgroundSize01-expected.checksum: Removed.
+        * fast/css/backgroundSize01-expected.png: Removed.
+        * fast/css/backgroundSize01-expected.txt: Removed.
+        * fast/css/backgroundSize01.html: Removed.
+        * fast/css/backgroundSize02-expected.checksum: Removed.
+        * fast/css/backgroundSize02-expected.png: Removed.
+        * fast/css/backgroundSize02-expected.txt: Removed.
+        * fast/css/backgroundSize02.html: Removed.
+        * fast/css/backgroundSize03-expected.checksum: Removed.
+        * fast/css/backgroundSize03-expected.png: Removed.
+        * fast/css/backgroundSize03-expected.txt: Removed.
+        * fast/css/backgroundSize03.html: Removed.
+        * fast/css/backgroundSize04-expected.checksum: Removed.
+        * fast/css/backgroundSize04-expected.png: Removed.
+        * fast/css/backgroundSize04-expected.txt: Removed.
+        * fast/css/backgroundSize04.html: Removed.
+        * fast/css/backgroundSize05-expected.checksum: Removed.
+        * fast/css/backgroundSize05-expected.png: Removed.
+        * fast/css/backgroundSize05-expected.txt: Removed.
+        * fast/css/backgroundSize05.html: Removed.
+        * fast/css/backgroundSize06-expected.checksum: Removed.
+        * fast/css/backgroundSize06-expected.png: Removed.
+        * fast/css/backgroundSize06-expected.txt: Removed.
+        * fast/css/backgroundSize06.html: Removed.
+        * fast/css/backgroundSize07-expected.checksum: Removed.
+        * fast/css/backgroundSize07-expected.png: Removed.
+        * fast/css/backgroundSize07-expected.txt: Removed.
+        * fast/css/backgroundSize07.html: Removed.
+        * fast/css/backgroundSize08-expected.checksum: Removed.
+        * fast/css/backgroundSize08-expected.png: Removed.
+        * fast/css/backgroundSize08-expected.txt: Removed.
+        * fast/css/backgroundSize08.html: Removed.
+        * fast/css/backgroundSize09-expected.checksum: Removed.
+        * fast/css/backgroundSize09-expected.png: Removed.
+        * fast/css/backgroundSize09-expected.txt: Removed.
+        * fast/css/backgroundSize09.html: Removed.
+        * fast/css/backgroundSize10-expected.checksum: Removed.
+        * fast/css/backgroundSize10-expected.png: Removed.
+        * fast/css/backgroundSize10-expected.txt: Removed.
+        * fast/css/backgroundSize10.html: Removed.
+        * fast/css/backgroundSize11-expected.checksum: Removed.
+        * fast/css/backgroundSize11-expected.png: Removed.
+        * fast/css/backgroundSize11-expected.txt: Removed.
+        * fast/css/backgroundSize11.html: Removed.
+        * fast/css/backgroundSize12-expected.checksum: Removed.
+        * fast/css/backgroundSize12-expected.png: Removed.
+        * fast/css/backgroundSize12-expected.txt: Removed.
+        * fast/css/backgroundSize12.html: Removed.
+        * fast/css/backgroundSize13-expected.checksum: Removed.
+        * fast/css/backgroundSize13-expected.png: Removed.
+        * fast/css/backgroundSize13-expected.txt: Removed.
+        * fast/css/backgroundSize13.html: Removed.
+        * fast/css/backgroundSize14-expected.checksum: Removed.
+        * fast/css/backgroundSize14-expected.png: Removed.
+        * fast/css/backgroundSize14-expected.txt: Removed.
+        * fast/css/backgroundSize14.html: Removed.
+        * fast/css/backgroundSize15-expected.checksum: Removed.
+        * fast/css/backgroundSize15-expected.png: Removed.
+        * fast/css/backgroundSize15-expected.txt: Removed.
+        * fast/css/backgroundSize15.html: Removed.
+        * fast/css/backgroundSize16-expected.checksum: Removed.
+        * fast/css/backgroundSize16-expected.png: Removed.
+        * fast/css/backgroundSize16-expected.txt: Removed.
+        * fast/css/backgroundSize16.html: Removed.
+        * fast/css/resources/bikes.bmp: Removed.
+
 2006-04-20  Adele Peterson  <adele@apple.com>
 
         Updated test results for: 

diff --git a/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.checksum b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.checksum
new file mode 100644 (file)
index 0000000..2f9013a
--- /dev/null
+++ b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.checksum
@@ -0,0 +1 @@
+93a18a51ff8374c5adc8f2641bfba1f6
\ No newline at end of file

diff --git a/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png
new file mode 100644 (file)
index 0000000..1405b10
Binary files /dev/null and b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.png differ

diff --git a/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.txt b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.txt
new file mode 100644 (file)
index 0000000..4b81038
--- /dev/null
+++ b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {UL} at (0,0) size 784x18
+        RenderListItem {LI} at (40,0) size 744x18
+          RenderListMarker at (-17,0) size 7x18

diff --git a/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip.html b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip.html
new file mode 100644 (file)
index 0000000..004097a
--- /dev/null
+++ b/LayoutTests/fast/backgrounds/repeat/noRepeatCorrectClip.html
@@ -0,0 +1,16 @@
+<head>
+       <style>
+            ul#nav li { 
+                background:url(http://i.a.cnn.net/cnn/.element/img/1.3/nav/nav.blue.gif) 
+                no-repeat;
+            }
+        </style>
+</head>
+
+<body>
+
+<ul id="nav">
+       <li></li>       
+</ul>
+
+</body>

diff --git a/LayoutTests/fast/backgrounds/repeat/resources/nav.blue.gif b/LayoutTests/fast/backgrounds/repeat/resources/nav.blue.gif
new file mode 100644 (file)
index 0000000..7f72d10
Binary files /dev/null and b/LayoutTests/fast/backgrounds/repeat/resources/nav.blue.gif differ

diff --git a/LayoutTests/fast/css/backgroundSize01-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize01-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize01-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize01-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize01-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize01-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize01-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize01-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize01-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize01-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize01.html b/LayoutTests/fast/backgrounds/size/backgroundSize01.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize01.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize01.html

diff --git a/LayoutTests/fast/css/backgroundSize02-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize02-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize02-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize02-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize02-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize02-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize02-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize02-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize02-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize02-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize02.html b/LayoutTests/fast/backgrounds/size/backgroundSize02.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize02.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize02.html

diff --git a/LayoutTests/fast/css/backgroundSize03-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize03-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize03-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize03-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize03-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize03-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize03-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize03-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize03-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize03-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize03.html b/LayoutTests/fast/backgrounds/size/backgroundSize03.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize03.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize03.html

diff --git a/LayoutTests/fast/css/backgroundSize04-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize04-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize04-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize04-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize04-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize04-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize04-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize04-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize04-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize04-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize04-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize04-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize04.html b/LayoutTests/fast/backgrounds/size/backgroundSize04.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize04.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize04.html

diff --git a/LayoutTests/fast/css/backgroundSize05-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize05-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize05-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize05-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize05-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize05-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize05-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize05-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize05-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize05-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize05.html b/LayoutTests/fast/backgrounds/size/backgroundSize05.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize05.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize05.html

diff --git a/LayoutTests/fast/css/backgroundSize06-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize06-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize06-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize06-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize06-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize06-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize06-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize06-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize06-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize06-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize06.html b/LayoutTests/fast/backgrounds/size/backgroundSize06.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize06.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize06.html

diff --git a/LayoutTests/fast/css/backgroundSize07-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize07-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize07-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize07-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize07-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize07-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize07-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize07-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize07-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize07-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize07.html b/LayoutTests/fast/backgrounds/size/backgroundSize07.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize07.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize07.html

diff --git a/LayoutTests/fast/css/backgroundSize08-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize08-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize08-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize08-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize08-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize08-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize08-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize08-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize08-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize08-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize08.html b/LayoutTests/fast/backgrounds/size/backgroundSize08.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize08.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize08.html

diff --git a/LayoutTests/fast/css/backgroundSize09-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize09-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize09-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize09-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize09-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize09-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize09-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize09-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize09-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize09-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize09-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize09-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize09.html b/LayoutTests/fast/backgrounds/size/backgroundSize09.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize09.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize09.html

diff --git a/LayoutTests/fast/css/backgroundSize10-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize10-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize10-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize10-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize10-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize10-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize10-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize10-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize10-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize10-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize10-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize10-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize10.html b/LayoutTests/fast/backgrounds/size/backgroundSize10.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize10.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize10.html

diff --git a/LayoutTests/fast/css/backgroundSize11-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize11-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize11-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize11-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize11-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize11-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize11-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize11-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize11-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize11-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize11-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize11-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize11.html b/LayoutTests/fast/backgrounds/size/backgroundSize11.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize11.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize11.html

diff --git a/LayoutTests/fast/css/backgroundSize12-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize12-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize12-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize12-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize12-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize12-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize12-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize12-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize12-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize12-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize12.html b/LayoutTests/fast/backgrounds/size/backgroundSize12.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize12.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize12.html

diff --git a/LayoutTests/fast/backgrounds/size/backgroundSize13-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize13-expected.checksum
new file mode 100644 (file)
index 0000000..7611ed1
--- /dev/null
+++ b/LayoutTests/fast/backgrounds/size/backgroundSize13-expected.checksum
@@ -0,0 +1 @@
+c8babed1810544a3947c7a963b1706df
\ No newline at end of file

diff --git a/LayoutTests/fast/backgrounds/size/backgroundSize13-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize13-expected.png
new file mode 100644 (file)
index 0000000..2808437
Binary files /dev/null and b/LayoutTests/fast/backgrounds/size/backgroundSize13-expected.png differ

diff --git a/LayoutTests/fast/css/backgroundSize13-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize13-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize13-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize13-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize13.html b/LayoutTests/fast/backgrounds/size/backgroundSize13.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize13.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize13.html

diff --git a/LayoutTests/fast/backgrounds/size/backgroundSize14-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize14-expected.checksum
new file mode 100644 (file)
index 0000000..23d9146
--- /dev/null
+++ b/LayoutTests/fast/backgrounds/size/backgroundSize14-expected.checksum
@@ -0,0 +1 @@
+89b70e0260691933869307a23385de2d
\ No newline at end of file

diff --git a/LayoutTests/fast/backgrounds/size/backgroundSize14-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize14-expected.png
new file mode 100644 (file)
index 0000000..e790a6b
Binary files /dev/null and b/LayoutTests/fast/backgrounds/size/backgroundSize14-expected.png differ

diff --git a/LayoutTests/fast/css/backgroundSize14-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize14-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize14-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize14-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize14.html b/LayoutTests/fast/backgrounds/size/backgroundSize14.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize14.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize14.html

diff --git a/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.checksum
new file mode 100644 (file)
index 0000000..92cc3c2
--- /dev/null
+++ b/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.checksum
@@ -0,0 +1 @@
+387985730c689b71ea30d5c7acf64953
\ No newline at end of file

diff --git a/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.png
new file mode 100644 (file)
index 0000000..985acae
Binary files /dev/null and b/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.png differ

diff --git a/LayoutTests/fast/css/backgroundSize15-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize15-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize15-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize15-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize15.html b/LayoutTests/fast/backgrounds/size/backgroundSize15.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize15.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize15.html

diff --git a/LayoutTests/fast/css/backgroundSize16-expected.checksum b/LayoutTests/fast/backgrounds/size/backgroundSize16-expected.checksum
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize16-expected.checksum
rename to LayoutTests/fast/backgrounds/size/backgroundSize16-expected.checksum

diff --git a/LayoutTests/fast/css/backgroundSize16-expected.png b/LayoutTests/fast/backgrounds/size/backgroundSize16-expected.png
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize16-expected.png
rename to LayoutTests/fast/backgrounds/size/backgroundSize16-expected.png

diff --git a/LayoutTests/fast/css/backgroundSize16-expected.txt b/LayoutTests/fast/backgrounds/size/backgroundSize16-expected.txt
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize16-expected.txt
rename to LayoutTests/fast/backgrounds/size/backgroundSize16-expected.txt

diff --git a/LayoutTests/fast/css/backgroundSize16.html b/LayoutTests/fast/backgrounds/size/backgroundSize16.html
similarity index 100%
rename from LayoutTests/fast/css/backgroundSize16.html
rename to LayoutTests/fast/backgrounds/size/backgroundSize16.html

diff --git a/LayoutTests/fast/css/resources/bikes.bmp b/LayoutTests/fast/backgrounds/size/resources/bikes.bmp
similarity index 100%
rename from LayoutTests/fast/css/resources/bikes.bmp
rename to LayoutTests/fast/backgrounds/size/resources/bikes.bmp

diff --git a/LayoutTests/fast/css/backgroundSize13-expected.checksum b/LayoutTests/fast/css/backgroundSize13-expected.checksum
deleted file mode 100644 (file)
index b46e157..0000000
--- a/LayoutTests/fast/css/backgroundSize13-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-47a7ac13b200431a77631b810410fb9c
\ No newline at end of file

diff --git a/LayoutTests/fast/css/backgroundSize13-expected.png b/LayoutTests/fast/css/backgroundSize13-expected.png
deleted file mode 100644 (file)
index 98c2a01..0000000
Binary files a/LayoutTests/fast/css/backgroundSize13-expected.png and /dev/null differ

diff --git a/LayoutTests/fast/css/backgroundSize14-expected.checksum b/LayoutTests/fast/css/backgroundSize14-expected.checksum
deleted file mode 100644 (file)
index 6f615f9..0000000
--- a/LayoutTests/fast/css/backgroundSize14-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-86ae57c74e9df5fa2314deed94c23780
\ No newline at end of file

diff --git a/LayoutTests/fast/css/backgroundSize14-expected.png b/LayoutTests/fast/css/backgroundSize14-expected.png
deleted file mode 100644 (file)
index 956d255..0000000
Binary files a/LayoutTests/fast/css/backgroundSize14-expected.png and /dev/null differ

diff --git a/LayoutTests/fast/css/backgroundSize15-expected.checksum b/LayoutTests/fast/css/backgroundSize15-expected.checksum
deleted file mode 100644 (file)
index 8d74fae..0000000
--- a/LayoutTests/fast/css/backgroundSize15-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-48b1c9efafb05210f60385edb938e96f
\ No newline at end of file

diff --git a/LayoutTests/fast/css/backgroundSize15-expected.png b/LayoutTests/fast/css/backgroundSize15-expected.png
deleted file mode 100644 (file)
index 0266f0e..0000000
Binary files a/LayoutTests/fast/css/backgroundSize15-expected.png and /dev/null differ

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 68f0ae3699258f9e354fdee9bde894c7b801c7e0..710846e0f8aec2982e402f0f6dc2b0506903b73d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2006-04-21  Beth Dakin  <bdakin@apple.com>
+
+        Reviewed by Hyatt.
+
+        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=8495 
+        REGRESSION: Sidebar on cnn.com is hosed
+
+        * platform/mac/ImageMac.mm:
+        (WebCore::Image::drawTiled): Use the size of the destination rect, 
+        not the oneTileRect in the no-pattern case.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintBackgroundExtended): Initialize 
+        scaledWidth and scaledHeight to the appropriate value (was wrong in 
+        scroll case), adjust position at appropriate times, and take out 
+        no-repeat clause for now since we don't have enough test cases yet 
+        to be sure we won't cause massive regressions. 
+
 2006-04-21  Darin Adler  <darin@apple.com>
 
         - attempt to fix Windows build after my last check-in

diff --git a/WebCore/platform/mac/ImageMac.mm b/WebCore/platform/mac/ImageMac.mm
index 1f2fa4fb3e58022c779b6e1e4bf0791476f285fa..ac980dc6e8529c06cb7ccaa6bc8c1d65366832ba 100644 (file)
--- a/WebCore/platform/mac/ImageMac.mm
+++ b/WebCore/platform/mac/ImageMac.mm
@@ -324,8 +324,8 @@ void Image::drawTiled(GraphicsContext* ctxt, const FloatRect& destRect, const Fl
         CGRect fromRect;
         fromRect.origin.x = (destRect.x() - oneTileRect.origin.x) / scaleX;
         fromRect.origin.y = (destRect.y() - oneTileRect.origin.y) / scaleY;
-        fromRect.size.width = oneTileRect.size.width / scaleX;
-        fromRect.size.height = oneTileRect.size.height / scaleY;
+        fromRect.size.width = destRect.width() / scaleX;
+        fromRect.size.height = destRect.height() / scaleY;
 
         draw(ctxt, destRect, fromRect, CompositeSourceOver);
         return;

diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 747ecf4f2b1b193fa527a256b8e545392408eff2..d3f7f95becacbc66c5912c04fabbf910a20c2295 100644 (file)
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -446,8 +446,8 @@ void RenderBox::paintBackgroundExtended(GraphicsContext* p, const Color& c, cons
         int sy = 0;
         int cw,ch;
         int cx,cy;
-        int scaledWidth = w;
-        int scaledHeight = h;
+        int scaledWidth, scaledHeight;
+
         
         // CSS2 chapter 14.2.1
 
@@ -469,6 +469,8 @@ void RenderBox::paintBackgroundExtended(GraphicsContext* p, const Color& c, cons
             
             int pw = w - hpab;
             int ph = h - vpab;
+            scaledWidth = pw;
+            scaledHeight = ph;
 
             int pixw = bg->imageSize().width();
             int pixh = bg->imageSize().height();
@@ -611,11 +613,11 @@ void RenderBox::paintBackgroundExtended(GraphicsContext* p, const Color& c, cons
             // If we are only repeating in one direction, we need to adjust the size and position of our
             // container to take our new scale into account.
             EBackgroundRepeat bgr = bgLayer->backgroundRepeat();
-            if ((bgr == REPEAT_X || bgr == NO_REPEAT) && scaledHeight < ch) {
+            if ((bgr == REPEAT_X || bgr == NO_REPEAT) && scaledHeight != ch) {
                 ch = scaledHeight;
                 cy -= bgLayer->backgroundYPosition().calcMinValue(scaledHeight - bg->imageSize().height());
             }
-            if ((bgr == REPEAT_Y || bgr == NO_REPEAT) && scaledWidth < cw) {
+            if ((bgr == REPEAT_Y || bgr == NO_REPEAT) && scaledWidth != cw) {
                 cw = scaledWidth;
                 cx -= bgLayer->backgroundXPosition().calcMinValue(scaledWidth - bg->imageSize().width());
             }        
@@ -624,15 +626,8 @@ void RenderBox::paintBackgroundExtended(GraphicsContext* p, const Color& c, cons
             scaledHeight = bg->imageSize().height();
         }
 
-        if (cw > 0 && ch > 0) {
-            if (bgLayer->backgroundRepeat() == NO_REPEAT) {
-                IntSize imageSize = bg->imageSize();
-                int originX = cx + int(fmodf(fmodf(-sx, imageSize.width()) - imageSize.width(), imageSize.width()));
-                int originY = cy + int(fmodf(fmodf(-sy, imageSize.height()) - imageSize.height(), imageSize.height()));
-                p->drawImage(bg->image(), IntRect(cx, cy, cw, ch), IntRect(IntPoint(originX, originY), imageSize));
-            } else
-                p->drawTiledImage(bg->image(), IntRect(cx, cy, cw, ch), IntPoint(sx, sy), IntSize(scaledWidth, scaledHeight));
-        }
+        if (cw > 0 && ch > 0)
+            p->drawTiledImage(bg->image(), IntRect(cx, cy, cw, ch), IntPoint(sx, sy), IntSize(scaledWidth, scaledHeight));
     }
     
     if (bgLayer->backgroundClip() != BGBORDER)